From 8fc0cc9aaa5795aa078ec6968413d529402f2f88 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Thu, 10 Oct 2019 22:32:35 +0530
Subject: [PATCH 001/328] Serialize draft (#8175)

* DEV: allow serializing data for drafts

* Various fixes

* added an alias method for 'serializeToDraft' to plugin-api

* fixed linting issues

* changed single quotes to double quotes to fix linting issue

* fixed linting issues

* fixed composer model file via prettier

* fixed composer controller file via prettier

* fixed plugin-api file via prettier
---
 .../discourse/controllers/composer.js.es6     | 41 +++++++--------
 .../discourse/lib/plugin-api.js.es6           | 52 ++++++++++++-------
 .../discourse/models/composer.js.es6          | 50 +++++++++++-------
 3 files changed, 84 insertions(+), 59 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index b96051e906..cf295cb870 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -39,26 +39,21 @@ function loadDraft(store, opts) {
     ((draft.title && draft.title !== "") || (draft.reply && draft.reply !== ""))
   ) {
     const composer = store.createRecord("composer");
+    const serializedFields = Composer.serializedFieldsForDraft();
 
-    composer.open({
+    let attrs = {
       draftKey,
       draftSequence,
-      action: draft.action,
-      title: draft.title,
-      categoryId: draft.categoryId || opts.categoryId,
-      postId: draft.postId,
-      archetypeId: draft.archetypeId,
-      reply: draft.reply,
-      metaData: draft.metaData,
-      usernames: draft.usernames,
       draft: true,
-      composerState: Composer.DRAFT,
-      composerTime: draft.composerTime,
-      typingTime: draft.typingTime,
-      whisper: draft.whisper,
-      tags: draft.tags,
-      noBump: draft.noBump
+      composerState: Composer.DRAFT
+    };
+
+    serializedFields.forEach(f => {
+      attrs[f] = draft[f] || opts[f];
     });
+
+    composer.open(attrs);
+
     return composer;
   }
 }
@@ -753,15 +748,15 @@ export default Ember.Controller.extend({
   },
 
   /**
-    Open the composer view
+   Open the composer view
 
-    @method open
-    @param {Object} opts Options for creating a post
-      @param {String} opts.action The action we're performing: edit, reply or createTopic
-      @param {Discourse.Post} [opts.post] The post we're replying to
-      @param {Discourse.Topic} [opts.topic] The topic we're replying to
-      @param {String} [opts.quote] If we're opening a reply from a quote, the quote we're making
-  **/
+   @method open
+   @param {Object} opts Options for creating a post
+   @param {String} opts.action The action we're performing: edit, reply or createTopic
+   @param {Discourse.Post} [opts.post] The post we're replying to
+   @param {Discourse.Topic} [opts.topic] The topic we're replying to
+   @param {String} [opts.quote] If we're opening a reply from a quote, the quote we're making
+   **/
   open(opts) {
     opts = opts || {};
 
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 4cf670b3de..76959bdaa6 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -43,6 +43,7 @@ import Sharing from "discourse/lib/sharing";
 import { addComposerUploadHandler } from "discourse/components/composer-editor";
 import { addCategorySortCriteria } from "discourse/components/edit-category-settings";
 import { queryRegistry } from "discourse/widgets/widget";
+import Composer from "discourse/models/composer";
 
 // If you add any methods to the API ensure you bump up this number
 const PLUGIN_API_VERSION = "0.8.32";
@@ -424,44 +425,44 @@ class PluginApi {
   }
 
   /**
-    Called whenever the "page" changes. This allows us to set up analytics
-    and other tracking.
+   Called whenever the "page" changes. This allows us to set up analytics
+   and other tracking.
 
-    To get notified when the page changes, you can install a hook like so:
+   To get notified when the page changes, you can install a hook like so:
 
-    ```javascript
-      api.onPageChange((url, title) => {
+   ```javascript
+   api.onPageChange((url, title) => {
         console.log('the page changed to: ' + url + ' and title ' + title);
       });
-    ```
-  **/
+   ```
+   **/
   onPageChange(fn) {
     this.onAppEvent("page:changed", data => fn(data.url, data.title));
   }
 
   /**
-    Listen for a triggered `AppEvent` from Discourse.
+   Listen for a triggered `AppEvent` from Discourse.
 
-    ```javascript
-      api.onAppEvent('inserted-custom-html', () => {
+   ```javascript
+   api.onAppEvent('inserted-custom-html', () => {
         console.log('a custom footer was rendered');
       });
-    ```
-  **/
+   ```
+   **/
   onAppEvent(name, fn) {
     const appEvents = this._lookupContainer("service:app-events");
     appEvents && appEvents.on(name, fn);
   }
 
   /**
-    Registers a function to generate custom avatar CSS classes
-    for a particular user.
+   Registers a function to generate custom avatar CSS classes
+   for a particular user.
 
-    Takes a function that will accept a user as a parameter
-    and return an array of CSS classes to apply.
+   Takes a function that will accept a user as a parameter
+   and return an array of CSS classes to apply.
 
-    ```javascript
-    api.customUserAvatarClasses(user => {
+   ```javascript
+   api.customUserAvatarClasses(user => {
       if (Ember.get(user, 'primary_group_name') === 'managers') {
         return ['managers'];
       }
@@ -844,6 +845,21 @@ class PluginApi {
     addComposerUploadHandler(extensions, method);
   }
 
+  /**
+   * Adds a field to draft serializer
+   *
+   * Example:
+   *
+   * api.serializeToDraft('key_set_in_model', 'field_name_in_payload');
+   *
+   * to keep both of them same
+   * api.serializeToDraft('field_name');
+   *
+   */
+  serializeToDraft(fieldName, property) {
+    Composer.serialzeToDraft(fieldName, property);
+  }
+
   /**
    * Registers a criteria that can be used as default topic order on category
    * pages.
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index de9d9042bc..9ba0afe0aa 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -57,6 +57,20 @@ const CLOSED = "closed",
     tags: "topic.tags",
     featuredLink: "topic.featured_link"
   },
+  _draft_serializer = {
+    reply: "reply",
+    action: "action",
+    title: "title",
+    categoryId: "categoryId",
+    archetypeId: "archetypeId",
+    whisper: "whisper",
+    metaData: "metaData",
+    composerTime: "composerTime",
+    typingTime: "typingTime",
+    postId: "post.id",
+    usernames: "targetUsernames"
+  },
+  _add_draft_fields = {},
   FAST_REPLY_LENGTH_THRESHOLD = 10000;
 
 export const SAVE_LABELS = {
@@ -722,6 +736,11 @@ const Composer = RestModel.extend({
       composer.appEvents.trigger("composer:reply-reloaded", composer);
     }
 
+    // Ensure additional draft fields are set
+    Object.keys(_add_draft_fields).forEach(f => {
+      this.set(_add_draft_fields[f], opts[f]);
+    });
+
     return false;
   },
 
@@ -1019,24 +1038,7 @@ const Composer = RestModel.extend({
       this._clearingStatus = null;
     }
 
-    let data = this.getProperties(
-      "reply",
-      "action",
-      "title",
-      "categoryId",
-      "archetypeId",
-      "whisper",
-      "metaData",
-      "composerTime",
-      "typingTime",
-      "tags",
-      "noBump"
-    );
-
-    data = Object.assign(data, {
-      usernames: this.targetUsernames,
-      postId: this.get("post.id")
-    });
+    let data = this.serialize(_draft_serializer);
 
     if (data.postId && !Ember.isEmpty(this.originalText)) {
       data.originalText = this.originalText;
@@ -1113,6 +1115,18 @@ Composer.reopenClass({
     return Object.keys(_create_serializer);
   },
 
+  serializeToDraft(fieldName, property) {
+    if (!property) {
+      property = fieldName;
+    }
+    _draft_serializer[fieldName] = property;
+    _add_draft_fields[fieldName] = property;
+  },
+
+  serializedFieldsForDraft() {
+    return Object.keys(_draft_serializer);
+  },
+
   // The status the compose view can have
   CLOSED,
   SAVING,

From 21f3c044e509945ba36d338b82542506cba912a2 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 10 Oct 2019 21:19:49 -0400
Subject: [PATCH 002/328] FIX: Mobile adjustments for reviewable list

---
 app/assets/stylesheets/mobile/reviewables.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/mobile/reviewables.scss b/app/assets/stylesheets/mobile/reviewables.scss
index 2e08bf39a9..16c00d79f1 100644
--- a/app/assets/stylesheets/mobile/reviewables.scss
+++ b/app/assets/stylesheets/mobile/reviewables.scss
@@ -5,6 +5,7 @@
     .reviewable-list {
       order: 2;
       width: 100%;
+      padding-bottom: 4em;
     }
 
     .reviewable-filters {
@@ -44,8 +45,9 @@
 }
 
 .reviewable-contents {
+  .reviewable-post-header,
   .post-body {
-    max-width: 295px;
+    max-width: 100%;
 
     p {
       overflow-x: scroll;

From 5c5845f3f278fbcf88eacb7fd15d4c92e481016b Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 10 Oct 2019 21:35:36 -0400
Subject: [PATCH 003/328] FIX: Minor Github onebox layout issues

- prevents long branch names from overflowing

- fixes alignment of inline avatars in preview
---
 app/assets/stylesheets/common/base/onebox.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index e707724b4d..b735363b85 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -412,6 +412,9 @@ pre.onebox code {
 
   .branches {
     font-size: $font-down-1;
+    code {
+      word-break: break-all;
+    }
   }
 
   .github-info {
@@ -445,6 +448,7 @@ pre.onebox code {
     border-radius: 2px;
     float: none;
     margin: 0;
+    padding: 0;
     vertical-align: middle;
     max-width: none;
   }

From 694a5bf229df2d8deb06b0f7cca9b2653ad8983a Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 11 Oct 2019 17:44:29 +1100
Subject: [PATCH 004/328] FIX: Prevent from creation of duplicated
 TopicAllowedUsers (#8169)

Ensure that we don't try to create duplicated TopicAllowedUsers

Related to https://meta.discourse.org/t/error-message-topic-allowed-users-is-invalid/130382/5

Spec amended to cover a case creating an overlap.
---
 app/models/topic_converter.rb       | 1 +
 spec/models/topic_converter_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index f59e96c4d0..aa23da10ad 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -81,6 +81,7 @@ class TopicConverter
       user.user_stat.save!
     end
     @topic.topic_allowed_users.build(user_id: @user.id) unless @topic.topic_allowed_users.where(user_id: @user.id).exists?
+    @topic.topic_allowed_users = @topic.topic_allowed_users.uniq(&:user_id)
     # update topics count
     @topic.user.user_stat.topic_count -= 1
     @topic.user.user_stat.save!
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index fb4b351d21..82b2664b02 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -114,7 +114,7 @@ describe TopicConverter do
 
     context 'success' do
       it "converts regular topic to private message" do
-        private_message = topic.convert_to_private_message(admin)
+        private_message = topic.convert_to_private_message(post.user)
         expect(private_message).to be_valid
         expect(topic.archetype).to eq("private_message")
         expect(topic.category_id).to eq(nil)

From 7d2f5240d94fd96760fdf884ec08aee14184cb8e Mon Sep 17 00:00:00 2001
From: Nacho Caballero <nachocab@gmail.com>
Date: Fri, 11 Oct 2019 09:50:37 +0200
Subject: [PATCH 005/328] FIX: Show a correct diff when editing consecutive
 paragraphs (#8177)

---
 lib/discourse_diff.rb                  |  2 +-
 lib/onpdiff.rb                         | 71 ++++++++++++++++++++++++++
 spec/components/discourse_diff_spec.rb |  7 +++
 spec/components/onpdiff_spec.rb        | 34 ++++++++++++
 4 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb
index 6445ac88cd..c2b3171623 100644
--- a/lib/discourse_diff.rb
+++ b/lib/discourse_diff.rb
@@ -12,7 +12,7 @@ class DiscourseDiff
     before_markdown = tokenize_line(CGI::escapeHTML(@before))
     after_markdown = tokenize_line(CGI::escapeHTML(@after))
 
-    @block_by_block_diff = ONPDiff.new(before_html, after_html).diff
+    @block_by_block_diff = ONPDiff.new(before_html, after_html).paragraph_diff
     @line_by_line_diff = ONPDiff.new(before_markdown, after_markdown).short_diff
   end
 
diff --git a/lib/onpdiff.rb b/lib/onpdiff.rb
index ef4799f2a4..6c86a79327 100644
--- a/lib/onpdiff.rb
+++ b/lib/onpdiff.rb
@@ -25,6 +25,10 @@ class ONPDiff
     @short_diff ||= build_short_edit_script(compose)
   end
 
+  def paragraph_diff
+    @paragraph_diff ||= build_paragraph_edit_script(diff)
+  end
+
   private
 
   def compose
@@ -156,4 +160,71 @@ class ONPDiff
     ses
   end
 
+  def build_paragraph_edit_script(ses)
+    paragraph_ses = []
+    i = 0
+    while i < ses.size
+      if ses[i][1] == :common
+        paragraph_ses << ses[i]
+      else
+        if ses[i][1] == :add
+          op_code = :add
+          opposite_op_code = :delete
+        else
+          op_code = :delete
+          opposite_op_code = :add
+        end
+        j = i + 1
+
+        while j < ses.size && ses[j][1] == op_code
+          j += 1
+        end
+
+        if j >= ses.size
+          paragraph_ses = paragraph_ses.concat(ses[i..j])
+          i = j
+        else
+          k = j
+          j -= 1
+
+          while k < ses.size && ses[k][1] == opposite_op_code
+            k += 1
+          end
+          k -= 1
+
+          num_before = j - i + 1
+          num_after = k - j
+          if num_after > 1
+            if num_before > num_after
+              i2 = i + num_before - num_after
+              paragraph_ses = paragraph_ses.concat(ses[i..i2 - 1])
+              i = i2
+            elsif num_after > num_before
+              k -= num_after - num_before
+            end
+            paragraph_ses = paragraph_ses.concat(pair_paragraphs(ses, i, j))
+          else
+            paragraph_ses = paragraph_ses.concat(ses[i..k])
+          end
+          i = k
+        end
+      end
+      i += 1
+    end
+
+    paragraph_ses
+  end
+
+  def pair_paragraphs(ses, i, j)
+    pairs = []
+    num_pairs = j - i + 1
+    num_pairs.times do
+      pairs << ses[i]
+      pairs << ses[i + num_pairs]
+      i += 1
+    end
+
+    pairs
+  end
+
 end
diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index a7aefc53fa..d1158aef20 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -76,6 +76,13 @@ describe DiscourseDiff do
       expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a paragraph</p></div><div class=\"revision-content\"><p>this is a <ins>great </ins>paragraph</p></div>")
     end
 
+    it "adds <ins> and <del> tags on consecutive paragraphs", :focus do
+      before = "<p>this is one paragraph</p><p>here is yet another</p>"
+      after = "<p>this is one great paragraph</p><p>here is another</p>"
+      got = DiscourseDiff.new(before, after).side_by_side_html
+      expect(got).to eq("<div class=\"revision-content\"><p>this is one paragraph</p><p>here is <del>yet </del>another</p></div><div class=\"revision-content\"><p>this is one <ins>great </ins>paragraph</p><p>here is another</p></div>")
+    end
+
     it "adds <del> tags around removed text on the left div" do
       before = "<p>this is a great paragraph</p>"
       after = "<p>this is a paragraph</p>"
diff --git a/spec/components/onpdiff_spec.rb b/spec/components/onpdiff_spec.rb
index 67c5b0beab..60b4039720 100644
--- a/spec/components/onpdiff_spec.rb
+++ b/spec/components/onpdiff_spec.rb
@@ -39,4 +39,38 @@ describe ONPDiff do
 
   end
 
+  describe "paragraph_diff" do
+
+    it "returns an empty array when there is no content to diff" do
+      expect(ONPDiff.new("", "").paragraph_diff).to eq([])
+    end
+
+    it "returns an array with the operation code for each element" do
+      expect(ONPDiff.new("abc", "acd").paragraph_diff).to eq([["a", :common], ["b", :delete], ["c", :common], ["d", :add]])
+    end
+
+    it "pairs as many elements as possible", :focus do
+      expect(ONPDiff.new("abcd", "abef").paragraph_diff).to eq([
+        ["a", :common], ["b", :common],
+        ["e", :add], ["c", :delete],
+        ["f", :add], ["d", :delete]
+      ])
+
+      expect(ONPDiff.new("abcde", "abfg").paragraph_diff).to eq([
+        ["a", :common], ["b", :common],
+        ["c", :delete],
+        ["d", :delete], ["f", :add],
+        ["e", :delete], ["g", :add]
+      ])
+
+      expect(ONPDiff.new("abcd", "abefg").paragraph_diff).to eq([
+        ["a", :common], ["b", :common],
+        ["e", :add],
+        ["f", :add], ["c", :delete],
+        ["g", :add], ["d", :delete]
+      ])
+    end
+
+  end
+
 end

From 3bcfa158a7f3b73e7cb22065691ee529e242a658 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Fri, 11 Oct 2019 13:21:18 +0530
Subject: [PATCH 006/328] fixed wrong method name while calling (#8182)

---
 app/assets/javascripts/discourse/lib/plugin-api.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 76959bdaa6..f54c0f4306 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -857,7 +857,7 @@ class PluginApi {
    *
    */
   serializeToDraft(fieldName, property) {
-    Composer.serialzeToDraft(fieldName, property);
+    Composer.serializeToDraft(fieldName, property);
   }
 
   /**

From 67787799bbcba6584189f2e5aec1f086478314fa Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 11 Oct 2019 09:57:55 +0100
Subject: [PATCH 007/328] DEV: Allow plugins to mark user custom fields as
 editable only by staff

This adds a staff_only parameter to the register_editable_user_custom_field API. The default is false, to maintain backwards compatibility.
---
 app/controllers/users_controller.rb    |  3 ++-
 app/models/user.rb                     | 20 +++++++++++++++++---
 lib/plugin/instance.rb                 |  4 ++--
 spec/requests/users_controller_spec.rb | 22 +++++++++++++++++++---
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 629faaa33c..5ffc97b712 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1425,7 +1425,8 @@ class UsersController < ApplicationController
       :card_background_upload_url
     ]
 
-    permitted << { custom_fields: User.editable_user_custom_fields } unless User.editable_user_custom_fields.blank?
+    editable_custom_fields = User.editable_user_custom_fields(by_staff: current_user.try(:staff?))
+    permitted << { custom_fields: editable_custom_fields } unless editable_custom_fields.blank?
     permitted.concat UserUpdater::OPTION_ATTR
     permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
     permitted.concat UserUpdater::TAG_NAMES.keys
diff --git a/app/models/user.rb b/app/models/user.rb
index 04c6af225a..af28a89a0e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -260,17 +260,31 @@ class User < ActiveRecord::Base
     @plugin_editable_user_custom_fields ||= {}
   end
 
-  def self.register_plugin_editable_user_custom_field(custom_field_name, plugin)
-    plugin_editable_user_custom_fields[custom_field_name] = plugin
+  def self.plugin_staff_editable_user_custom_fields
+    @plugin_staff_editable_user_custom_fields ||= {}
   end
 
-  def self.editable_user_custom_fields
+  def self.register_plugin_editable_user_custom_field(custom_field_name, plugin, staff_only: false)
+    if staff_only
+      plugin_staff_editable_user_custom_fields[custom_field_name] = plugin
+    else
+      plugin_editable_user_custom_fields[custom_field_name] = plugin
+    end
+  end
+
+  def self.editable_user_custom_fields(by_staff: false)
     fields = []
 
     plugin_editable_user_custom_fields.each do |k, v|
       fields << k if v.enabled?
     end
 
+    if by_staff
+      plugin_staff_editable_user_custom_fields.each do |k, v|
+        fields << k if v.enabled?
+      end
+    end
+
     fields.uniq
   end
 
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 28a7c34c36..945def58ba 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -141,9 +141,9 @@ class Plugin::Instance
     end
   end
 
-  def register_editable_user_custom_field(field)
+  def register_editable_user_custom_field(field, staff_only: false)
     reloadable_patch do |plugin|
-      ::User.register_plugin_editable_user_custom_field(field, plugin) # plugin.enabled? is checked at runtime
+      ::User.register_plugin_editable_user_custom_field(field, plugin, staff_only: staff_only) # plugin.enabled? is checked at runtime
     end
   end
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 9d4ab992cc..26a952fca5 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1764,40 +1764,56 @@ describe UsersController do
             before do
               plugin = Plugin::Instance.new
               plugin.register_editable_user_custom_field :test2
+              plugin.register_editable_user_custom_field :test3, staff_only: true
             end
 
             after do
               User.plugin_editable_user_custom_fields.clear
+              User.plugin_staff_editable_user_custom_fields.clear
             end
 
             it "only updates allowed user fields" do
-              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2 } }
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2, test3: :hello3 } }
 
               expect(response.status).to eq(200)
               expect(user.custom_fields["test1"]).to be_blank
               expect(user.custom_fields["test2"]).to eq("hello2")
+              expect(user.custom_fields["test3"]).to be_blank
             end
 
             it "works alongside a user field" do
               user_field = Fabricate(:user_field, editable: true)
-              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2 }, user_fields: { user_field.id.to_s => 'happy' } }
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2, test3: :hello3 }, user_fields: { user_field.id.to_s => 'happy' } }
               expect(response.status).to eq(200)
               expect(user.custom_fields["test1"]).to be_blank
               expect(user.custom_fields["test2"]).to eq("hello2")
+              expect(user.custom_fields["test3"]).to eq(nil)
               expect(user.user_fields[user_field.id.to_s]).to eq('happy')
             end
 
             it "is secure when there are no registered editable fields" do
               User.plugin_editable_user_custom_fields.clear
-              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2 } }
+              User.plugin_staff_editable_user_custom_fields.clear
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2, test3: :hello3 } }
               expect(response.status).to eq(200)
               expect(user.custom_fields["test1"]).to be_blank
               expect(user.custom_fields["test2"]).to be_blank
+              expect(user.custom_fields["test3"]).to be_blank
 
               put "/u/#{user.username}.json", params: { custom_fields: ["arrayitem1", "arrayitem2"] }
               expect(response.status).to eq(200)
             end
 
+            it "allows staff to edit staff-editable fields" do
+              sign_in(Fabricate(:admin))
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2, test3: :hello3 } }
+
+              expect(response.status).to eq(200)
+              expect(user.custom_fields["test1"]).to be_blank
+              expect(user.custom_fields["test2"]).to eq("hello2")
+              expect(user.custom_fields["test3"]).to eq("hello3")
+            end
+
           end
         end
 

From 9a81cb9e556b5b5070ef9256365f1642aeec81ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 11 Oct 2019 11:13:10 +0200
Subject: [PATCH 008/328] FIX: ensure we remove tempfiles from disk when
 creating an upload

Follow-up to 46d12c5ad3e8116bdc8e1662e55a4e63ed32dfb9
---
 lib/upload_creator.rb | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 632d7a7da0..0a0c8d43c4 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -143,7 +143,9 @@ class UploadCreator
       @upload
     end
   ensure
-    @file&.close
+    if @file
+      @file.respond_to?(:close!) ? @file.close! : @file.close
+    end
   end
 
   def extract_image_info!
@@ -197,11 +199,11 @@ class UploadCreator
     keep_jpeg &&= (filesize - new_size) > MIN_CONVERT_TO_JPEG_BYTES_SAVED
 
     if keep_jpeg
-      @file.close
+      @file.respond_to?(:close!) ? @file.close! : @file.close
       @file = jpeg_tempfile
       extract_image_info!
     else
-      jpeg_tempfile&.close
+      jpeg_tempfile.close!
     end
   end
 
@@ -230,16 +232,21 @@ class UploadCreator
       original_size = filesize
       down_tempfile = Tempfile.new(["down", ".#{@image_info.type}"])
 
+      from = @file.path
+      to = down_tempfile.path
+
+      OptimizedImage.ensure_safe_paths!(from, to)
+
       OptimizedImage.downsize(
-        @file.path,
-        down_tempfile.path,
+        from,
+        to,
         "50%",
         filename: @filename,
         allow_animation: allow_animation,
         raise_on_error: true
       )
 
-      @file.close
+      @file.respond_to?(:close!) ? @file.close! : @file.close
       @file = down_tempfile
 
       extract_image_info!

From 3a469a79cfb641ec7782a995ca1fd88be1f8dcf3 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 11 Oct 2019 11:37:44 -0400
Subject: [PATCH 009/328] FEATURE: search topics when adding a link in composer
 (#8178)

---
 .../controllers/insert-hyperlink.js.es6       | 151 ++++++++++++++++--
 .../templates/modal/insert-hyperlink.hbs      |  23 ++-
 app/assets/stylesheets/common/base/modal.scss |  33 ++++
 config/locales/client.en.yml                  |   2 +-
 .../acceptance/composer-hyperlink-test.js.es6 |  53 ++++--
 5 files changed, 237 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index d4f15d95cf..313ab332c3 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,15 +1,140 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { searchForTerm } from "discourse/lib/search";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  linkUrl: "",
-  linkText: "",
+  _debounced: null,
+  _activeSearch: null,
 
   onShow() {
-    Ember.run.next(() =>
-      $(this)
-        .find("input.link-url")
-        .focus()
-    );
+    this.setProperties({
+      linkUrl: "",
+      linkText: "",
+      searchResults: [],
+      searchLoading: false,
+      selectedRow: -1
+    });
+
+    Ember.run.scheduleOnce("afterRender", () => {
+      const element = document.querySelector(".insert-link");
+
+      element.addEventListener("keydown", e => this.keyDown(e));
+
+      element
+        .closest(".modal-inner-container")
+        .addEventListener("mousedown", e => this.mouseDown(e));
+
+      document.querySelector("input.link-url").focus();
+    });
+  },
+
+  keyDown(e) {
+    switch (e.which) {
+      case 40:
+        this.highlightRow(e, "down");
+        break;
+      case 38:
+        this.highlightRow(e, "up");
+        break;
+      case 13:
+        // override Enter behaviour when a row is selected
+        if (this.selectedRow > -1) {
+          const selected = document.querySelectorAll(
+            ".internal-link-results .search-link"
+          )[this.selectedRow];
+          this.selectLink(selected);
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        break;
+      case 27:
+        // Esc should cancel dropdown first
+        if (this.searchResults.length) {
+          this.set("searchResults", []);
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        break;
+    }
+  },
+
+  mouseDown(e) {
+    if (!e.target.closest(".inputs")) {
+      this.set("searchResults", []);
+    }
+  },
+
+  highlightRow(e, direction) {
+    const index =
+      direction === "down" ? this.selectedRow + 1 : this.selectedRow - 1;
+
+    if (index > -1 && index < this.searchResults.length) {
+      document
+        .querySelectorAll(".internal-link-results .search-link")
+        [index].focus();
+      this.set("selectedRow", index);
+    } else {
+      this.set("selectedRow", -1);
+      document.querySelector("input.link-url").focus();
+    }
+
+    e.preventDefault();
+  },
+
+  selectLink(el) {
+    this.setProperties({
+      linkUrl: el.href,
+      searchResults: [],
+      selectedRow: -1
+    });
+
+    if (!this.linkText && el.dataset.title) {
+      this.set("linkText", el.dataset.title);
+    }
+
+    document.querySelector("input.link-text").focus();
+  },
+
+  triggerSearch() {
+    if (this.linkUrl.length > 3 && this.linkUrl.indexOf("http") === -1) {
+      this.set("searchLoading", true);
+      this._activeSearch = searchForTerm(this.linkUrl, {
+        typeFilter: "topic"
+      });
+      this._activeSearch
+        .then(results => {
+          if (results && results.topics && results.topics.length > 0) {
+            this.set("searchResults", results.topics);
+          } else {
+            this.set("searchResults", []);
+          }
+        })
+        .finally(() => {
+          this.set("searchLoading", false);
+          this._activeSearch = null;
+        });
+    } else {
+      this.abortSearch();
+    }
+  },
+
+  abortSearch() {
+    if (this._activeSearch) {
+      this._activeSearch.abort();
+    }
+    this.setProperties({
+      searchResults: [],
+      searchLoading: false
+    });
+  },
+
+  onClose() {
+    const element = document.querySelector(".insert-link");
+    element.removeEventListener("keydown", this.keyDown);
+    element
+      .closest(".modal-inner-container")
+      .removeEventListener("mousedown", this.mouseDown);
+
+    Ember.run.cancel(this._debounced);
   },
 
   actions: {
@@ -35,12 +160,20 @@ export default Ember.Controller.extend(ModalFunctionality, {
           this.toolbarEvent.selectText(sel.start + 1, origLink.length);
         }
       }
-      this.set("linkUrl", "");
-      this.set("linkText", "");
       this.send("closeModal");
     },
     cancel() {
       this.send("closeModal");
+    },
+    linkClick(e) {
+      if (!e.metaKey && !e.ctrlKey) {
+        e.preventDefault();
+        e.stopPropagation();
+        this.selectLink(e.target);
+      }
+    },
+    search() {
+      this._debounced = Ember.run.debounce(this, this.triggerSearch, 400);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index 8aa0607266..ec15a2b501 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -1,6 +1,27 @@
 {{#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"}}
+      {{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 |r index|}}
+            <a
+              class="search-link"
+              href="{{r.url}}"
+              onclick={{action "linkClick"}}
+              data-title="{{r.title}}">
+              {{replace-emoji r.fancy_title}}
+            </a>
+          {{/each}}
+        </div>
+      {{/if}}
     </div>
     <div class="inputs">
       {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index bf181bfc70..44f7c2fbf2 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -201,9 +201,42 @@
     }
 
     &.insert-link {
+      overflow-y: visible;
       input {
         min-width: 300px;
       }
+
+      .inputs {
+        position: relative;
+        .spinner {
+          position: absolute;
+          right: 8px;
+          top: -15px;
+          width: 10px;
+          height: 10px;
+        }
+        .internal-link-results {
+          position: absolute;
+          top: 70%;
+          padding: 5px 10px;
+          box-shadow: shadow("card");
+          z-index: 5;
+          background-color: $secondary;
+          max-height: 150px;
+          width: 90%;
+          overflow-y: auto;
+          > a {
+            padding: 6px;
+            border-bottom: 1px solid $primary-low;
+            cursor: pointer;
+            display: block;
+            &:hover,
+            &:focus {
+              background-color: $highlight-medium;
+            }
+          }
+        }
+      }
     }
     textarea {
       width: 99%;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f30f1087fb..df10b60207 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1685,7 +1685,7 @@ en:
       link_description: "enter link description here"
       link_dialog_title: "Insert Hyperlink"
       link_optional_text: "optional title"
-      link_url_placeholder: "https://example.com"
+      link_url_placeholder: "Paste a URL or type to search topics"
       quote_title: "Blockquote"
       quote_text: "Blockquote"
       code_title: "Preformatted text"
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js.es6 b/test/javascripts/acceptance/composer-hyperlink-test.js.es6
index 52ff6c7d03..dd1914ed8c 100644
--- a/test/javascripts/acceptance/composer-hyperlink-test.js.es6
+++ b/test/javascripts/acceptance/composer-hyperlink-test.js.es6
@@ -9,18 +9,13 @@ QUnit.test("add a hyperlink to a reply", async assert => {
   await click(".topic-post:first-child button.reply");
   await fillIn(".d-editor-input", "This is a link to ");
 
-  assert.equal(
-    find(".insert-link.modal-body").length,
-    0,
+  assert.ok(
+    !exists(".insert-link.modal-body"),
     "no hyperlink modal by default"
   );
 
   await click(".d-editor button.link");
-  assert.equal(
-    find(".insert-link.modal-body").length,
-    1,
-    "hyperlink modal visible"
-  );
+  assert.ok(exists(".insert-link.modal-body"), "hyperlink modal visible");
 
   await fillIn(".modal-body .link-url", "google.com");
   await fillIn(".modal-body .link-text", "Google");
@@ -32,9 +27,8 @@ QUnit.test("add a hyperlink to a reply", async assert => {
     "adds link with url and text, prepends 'http://'"
   );
 
-  assert.equal(
-    find(".insert-link.modal-body").length,
-    0,
+  assert.ok(
+    !exists(".insert-link.modal-body"),
     "modal dismissed after submitting link"
   );
 
@@ -51,9 +45,8 @@ QUnit.test("add a hyperlink to a reply", async assert => {
     "adds link with url and text, prepends 'http://'"
   );
 
-  assert.equal(
-    find(".insert-link.modal-body").length,
-    0,
+  assert.ok(
+    !exists(".insert-link.modal-body"),
     "modal dismissed after cancelling"
   );
 
@@ -70,4 +63,36 @@ QUnit.test("add a hyperlink to a reply", async assert => {
     "[Reset](http://somelink.com) textarea contents.",
     "adds link to a selected text"
   );
+
+  await fillIn(".d-editor-input", "");
+
+  await click(".d-editor button.link");
+  await fillIn(".modal-body .link-url", "http://google.com");
+  await keyEvent(".modal-body .link-url", "keyup", 32);
+  assert.ok(
+    !exists(".internal-link-results"),
+    "does not show internal links search dropdown when inputting a url"
+  );
+
+  await fillIn(".modal-body .link-url", "local");
+  await keyEvent(".modal-body .link-url", "keyup", 32);
+  assert.ok(
+    exists(".internal-link-results"),
+    "shows internal links search dropdown when entering keywords"
+  );
+
+  await keyEvent(".insert-link", "keydown", 40);
+  await keyEvent(".insert-link", "keydown", 13);
+
+  assert.ok(
+    !exists(".internal-link-results"),
+    "search dropdown dismissed after selecting an internal link"
+  );
+
+  assert.ok(
+    find(".link-url")
+      .val()
+      .includes("http"),
+    "replaces link url field with internal link"
+  );
 });

From 76ab0350f19e72cf33395768a8ce6736fec9565e Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 11 Oct 2019 12:38:16 -0300
Subject: [PATCH 010/328] FIX: Properly encoded slugs when configured to
 (#8158)

When an admin changes the site setting slug_generation_method to
encoded, we weren't really encoding the slug, but just allowing non-ascii
characters in the slug (unicode).

That brings problems when a user posts a link to topic without the slug, as
our topic controller tries to redirect the user to the correct URL that contains
the slug with unicode characters. Having unicode in the Location header in a
response is a RFC violation and some browsers end up in a redirection loop.

Bug report: https://meta.discourse.org/t/-/125371?u=falco

This commit also checks if a site uses encoded slugs and clear all saved slugs
in the db so they can be regenerated using an onceoff job.
---
 app/controllers/topics_controller.rb        |  6 +++++-
 app/jobs/onceoff/fix_encoded_topic_slugs.rb | 14 ++++++++++++++
 lib/slug.rb                                 |  4 +++-
 spec/components/slug_spec.rb                | 10 +++++-----
 spec/models/category_spec.rb                |  4 ++--
 spec/models/topic_spec.rb                   |  2 +-
 6 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 app/jobs/onceoff/fix_encoded_topic_slugs.rb

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 9de9c79592..d806413fbc 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -900,7 +900,11 @@ class TopicsController < ApplicationController
   end
 
   def slugs_do_not_match
-    params[:slug] && @topic_view.topic.slug != params[:slug]
+    if SiteSetting.slug_generation_method != "encoded"
+      params[:slug] && @topic_view.topic.slug != params[:slug]
+    else
+      params[:slug] && CGI.unescape(@topic_view.topic.slug) != params[:slug]
+    end
   end
 
   def redirect_to_correct_topic(topic, post_number = nil)
diff --git a/app/jobs/onceoff/fix_encoded_topic_slugs.rb b/app/jobs/onceoff/fix_encoded_topic_slugs.rb
new file mode 100644
index 0000000000..4640493fb9
--- /dev/null
+++ b/app/jobs/onceoff/fix_encoded_topic_slugs.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  class FixEncodedTopicSlugs < ::Jobs::Onceoff
+    def execute_onceoff(args)
+      return unless SiteSetting.slug_generation_method == 'encoded'
+
+      #Make all slugs nil and let the app regenerate with proper encoded ones
+      Topic.update_all(slug: nil)
+    end
+  end
+
+end
diff --git a/lib/slug.rb b/lib/slug.rb
index 12fe660c43..8436f74ebc 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -50,7 +50,9 @@ module Slug
       .gsub(/\s+/, '-')
       .gsub(CHAR_FILTER_REGEXP, '')
 
-    downcase ? string.downcase : string
+    string = string.downcase if downcase
+
+    CGI.escape(string)
   end
 
   def self.none_generator(string)
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index d475e578c2..dba8bcb6f5 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -60,7 +60,7 @@ describe Slug do
       after { SiteSetting.slug_generation_method = 'ascii' }
 
       it 'generates the slug' do
-        expect(Slug.for("熱帶風暴畫眉")).to eq('熱帶風暴畫眉')
+        expect(Slug.for("熱帶風暴畫眉")).to eq('%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89')
         expect(Slug.for("Jeff hate's !~-_|,=#this")).to eq("jeff-hates-this")
       end
 
@@ -75,7 +75,7 @@ describe Slug do
       it "handles the special characters" do
         expect(Slug.for(
           " - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- "
-        )).to eq("english-and-chinese-title-with-special-characters-中文标题")
+        )).to eq("english-and-chinese-title-with-special-characters-%E4%B8%AD%E6%96%87%E6%A0%87%E9%A2%98")
       end
 
       it "kills the trailing dash" do
@@ -151,9 +151,9 @@ describe Slug do
     after { SiteSetting.slug_generation_method = 'ascii' }
 
     it 'generates precentage encoded string' do
-      expect(Slug.encoded_generator("뉴스피드")).to eq("뉴스피드")
-      expect(Slug.encoded_generator("آموزش اضافه کردن لینک اختیاری به هدر")).to eq("آموزش-اضافه-کردن-لینک-اختیاری-به-هدر")
-      expect(Slug.encoded_generator("熱帶風暴畫眉")).to eq("熱帶風暴畫眉")
+      expect(Slug.encoded_generator("뉴스피드")).to eq("%EB%89%B4%EC%8A%A4%ED%94%BC%EB%93%9C")
+      expect(Slug.encoded_generator("آموزش اضافه کردن لینک اختیاری به هدر")).to eq("%D8%A2%D9%85%D9%88%D8%B2%D8%B4-%D8%A7%D8%B6%D8%A7%D9%81%D9%87-%DA%A9%D8%B1%D8%AF%D9%86-%D9%84%DB%8C%D9%86%DA%A9-%D8%A7%D8%AE%D8%AA%DB%8C%D8%A7%D8%B1%DB%8C-%D8%A8%D9%87-%D9%87%D8%AF%D8%B1")
+      expect(Slug.encoded_generator("熱帶風暴畫眉")).to eq("%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89")
     end
 
     it 'reject RFC 3986 reserved character and blank' do
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 298bfc2b44..581d20b82e 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -313,8 +313,8 @@ describe Category do
       end
 
       it "creates a slug" do
-        expect(@category.slug).to eq("测试")
-        expect(@category.slug_for_url).to eq("测试")
+        expect(@category.slug).to eq("%E6%B5%8B%E8%AF%95")
+        expect(@category.slug_for_url).to eq("%E6%B5%8B%E8%AF%95")
       end
     end
   end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 23dfdf5b75..7674cc6fe9 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -158,7 +158,7 @@ describe Topic do
 
         it "returns encoded Slug for a title" do
           expect(topic.title).to eq(title)
-          expect(topic.slug).to eq(title)
+          expect(topic.slug).to eq('%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89')
         end
       end
 

From f63db1c4c8f6a8f10defd1daea9fb2ae8d2519b3 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 11 Oct 2019 11:07:19 -0500
Subject: [PATCH 011/328] FIX: Accurate sub_total calculation for
 reviewable_scores (#8184)

---
 app/models/reviewable.rb             |  2 +-
 app/models/reviewable_score.rb       |  8 ++++++--
 spec/models/reviewable_score_spec.rb | 29 +++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 750f99544a..8966621a7e 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -158,8 +158,8 @@ class Reviewable < ActiveRecord::Base
 
     type_bonus = PostActionType.where(id: reviewable_score_type).pluck(:score_bonus)[0] || 0
     take_action_bonus = take_action ? 5.0 : 0.0
-    sub_total = (ReviewableScore.user_flag_score(user) + type_bonus + take_action_bonus)
     user_accuracy_bonus = ReviewableScore.user_accuracy_bonus(user)
+    sub_total = ReviewableScore.calculate_score(user, type_bonus, take_action_bonus)
 
     # We can force a reviewable to hit the threshold, for example with queued posts
     if force_review && sub_total < Reviewable.min_score_for_priority
diff --git a/app/models/reviewable_score.rb b/app/models/reviewable_score.rb
index 1fe2897297..cbe561f355 100644
--- a/app/models/reviewable_score.rb
+++ b/app/models/reviewable_score.rb
@@ -45,12 +45,16 @@ class ReviewableScore < ActiveRecord::Base
     take_action_bonus > 0
   end
 
+  def self.calculate_score(user, type_bonus, take_action_bonus)
+    score = user_flag_score(user) + type_bonus + take_action_bonus
+    score > 0 ? score : 0
+  end
+
   # A user's flag score is:
   #   1.0 + trust_level + user_accuracy_bonus
   #   (trust_level is 5 for staff)
   def self.user_flag_score(user)
-    score = 1.0 + (user.staff? ? 5.0 : user.trust_level.to_f) + user_accuracy_bonus(user)
-    score >= 0 ? score : 0
+    1.0 + (user.staff? ? 5.0 : user.trust_level.to_f) + user_accuracy_bonus(user)
   end
 
   # A user's accuracy bonus is:
diff --git a/spec/models/reviewable_score_spec.rb b/spec/models/reviewable_score_spec.rb
index 47fe188f61..1b74a26d48 100644
--- a/spec/models/reviewable_score_spec.rb
+++ b/spec/models/reviewable_score_spec.rb
@@ -145,7 +145,6 @@ RSpec.describe ReviewableScore, type: :model do
       user_stat.flags_disagreed = 12
       expect(ReviewableScore.user_accuracy_bonus(user).floor(2)).to eq(12.27)
     end
-
   end
 
   describe ".user_flag_score" do
@@ -172,13 +171,29 @@ RSpec.describe ReviewableScore, type: :model do
         user_stat.flags_ignored = 2
         expect(ReviewableScore.user_flag_score(user).floor(2)).to eq(7.99)
       end
+    end
+  end
 
-      it 'return 0 if the accuracy_bonus would make the score negative' do
-        user.trust_level = 3
-        user_stat.flags_agreed = 0
-        user_stat.flags_disagreed = 1000
-        expect(ReviewableScore.user_flag_score(user)).to eq(0)
-      end
+  describe ".calculate_score" do
+    fab!(:user) { Fabricate(:user) }
+    let(:user_stat) { user.user_stat }
+
+    it 'never returns less than 0' do
+      user.trust_level = 2
+      user_stat.flags_agreed = 1
+      user_stat.flags_disagreed = 1000
+      flag_score = -21.88
+      expect(ReviewableScore.user_flag_score(user).floor(2)).to eq(flag_score)
+      expect(ReviewableScore.calculate_score(user, 5, 5)).to eq(0)
+    end
+
+    it 'returns user_flag_score + type_bonus + take_action_bonus' do
+      user.trust_level = 2
+      user_stat.flags_agreed = 12
+      user_stat.flags_disagreed = 2
+      flag_score = 7.99
+      expect(ReviewableScore.user_flag_score(user).floor(2)).to eq(flag_score)
+      expect(ReviewableScore.calculate_score(user, 2, 3)).to eq(flag_score + 2 + 3)
     end
   end
 

From 01bc465db819d5ba0e433a8226c80a9bd38b593d Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 11 Oct 2019 14:38:10 -0300
Subject: [PATCH 012/328] DEV: Split max decompressed setting for themes and
 backups (#8179)

---
 config/site_settings.yml                      |  5 ++++-
 ...1_migrate_decompressed_file_max_size_mb.rb | 19 +++++++++++++++++++
 lib/backup_restore/restorer.rb                | 11 +++++++++--
 lib/compression/pipeline.rb                   |  4 ++--
 lib/compression/strategy.rb                   |  8 ++++----
 lib/theme_store/zip_importer.rb               |  3 ++-
 .../theme_store/zip_exporter_spec.rb          |  3 ++-
 spec/lib/compression/engine_spec.rb           |  8 +++++---
 8 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 db/migrate/20191011131041_migrate_decompressed_file_max_size_mb.rb

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 2d5daec397..2f3962e4c0 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1201,9 +1201,12 @@ files:
     default: 5
     min: 0
     max: 20
-  decompressed_file_max_size_mb:
+  decompressed_theme_max_file_size_mb:
     default: 1000
     hidden: true
+  decompressed_backup_max_file_size_mb:
+    default: 100000
+    hidden: true
 
 trust:
   default_trust_level:
diff --git a/db/migrate/20191011131041_migrate_decompressed_file_max_size_mb.rb b/db/migrate/20191011131041_migrate_decompressed_file_max_size_mb.rb
new file mode 100644
index 0000000000..f3db85da39
--- /dev/null
+++ b/db/migrate/20191011131041_migrate_decompressed_file_max_size_mb.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class MigrateDecompressedFileMaxSizeMb < ActiveRecord::Migration[6.0]
+  def up
+    current_value = DB.query_single("SELECT value FROM site_settings WHERE name ='decompressed_file_max_size_mb' ").first
+
+    if current_value && current_value != '1000'
+      DB.exec <<~SQL
+        INSERT INTO site_settings (name, data_type, value, created_at, updated_at)
+        VALUES
+          ('decompressed_theme_max_file_size_mb', 3, #{current_value}, current_timestamp, current_timestamp),
+          ('decompressed_backup_max_file_size_mb', 3, #{current_value}, current_timestamp, current_timestamp)
+      SQL
+    end
+  end
+
+  def down
+  end
+end
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 2480941ceb..42fd2db39f 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -92,6 +92,9 @@ module BackupRestore
       extract_uploads
 
       after_restore_hook
+    rescue Compression::Strategy::ExtractFailed
+      log "The uncompressed file is too big. Consider increasing the decompressed_theme_max_file_size_mb hidden setting."
+      rollback
     rescue SystemExit
       log "Restore process was cancelled!"
       rollback
@@ -138,7 +141,7 @@ module BackupRestore
 
       pipeline = Compression::Pipeline.new([Compression::Tar.new, Compression::Gzip.new])
 
-      unzipped_path = pipeline.decompress(@tmp_directory, @archive_filename)
+      unzipped_path = pipeline.decompress(@tmp_directory, @archive_filename, available_size)
       pipeline.strip_directory(unzipped_path, @tmp_directory)
     end
 
@@ -170,11 +173,15 @@ module BackupRestore
 
       log "Extracting dump file..."
 
-      Compression::Gzip.new.decompress(@tmp_directory, @dump_filename)
+      Compression::Gzip.new.decompress(@tmp_directory, @dump_filename, available_size)
     end
 
     protected
 
+    def available_size
+      SiteSetting.decompressed_backup_max_file_size_mb
+    end
+
     def ensure_restore_is_enabled
       raise BackupRestore::RestoreDisabledError unless Rails.env.development? || SiteSetting.allow_restore?
     end
diff --git a/lib/compression/pipeline.rb b/lib/compression/pipeline.rb
index f955268cd5..98a93cce41 100644
--- a/lib/compression/pipeline.rb
+++ b/lib/compression/pipeline.rb
@@ -20,10 +20,10 @@ module Compression
       end
     end
 
-    def decompress(dest_path, compressed_file_path, allow_non_root_folder: false)
+    def decompress(dest_path, compressed_file_path, max_size, allow_non_root_folder: false)
       @strategies.reverse.reduce(compressed_file_path) do |to_decompress, strategy|
         last_extension = strategy.extension
-        strategy.decompress(dest_path, to_decompress, allow_non_root_folder: allow_non_root_folder)
+        strategy.decompress(dest_path, to_decompress, max_size, allow_non_root_folder: allow_non_root_folder)
         to_decompress.gsub(last_extension, '')
       end
     end
diff --git a/lib/compression/strategy.rb b/lib/compression/strategy.rb
index 921ebd8013..47151a3bf0 100644
--- a/lib/compression/strategy.rb
+++ b/lib/compression/strategy.rb
@@ -9,11 +9,11 @@ module Compression
       file_name.include?(extension)
     end
 
-    def decompress(dest_path, compressed_file_path, allow_non_root_folder: false)
+    def decompress(dest_path, compressed_file_path, max_size, allow_non_root_folder: false)
       sanitized_compressed_file_path = sanitize_path(compressed_file_path)
 
       get_compressed_file_stream(sanitized_compressed_file_path) do |compressed_file|
-        available_size = calculate_available_size
+        available_size = calculate_available_size(max_size)
 
         entries_of(compressed_file).each do |entry|
           entry_path = build_entry_path(
@@ -59,8 +59,8 @@ module Compression
       end
     end
 
-    def calculate_available_size
-      1024**2 * (SiteSetting.decompressed_file_max_size_mb / 1.049) # Mb to Mib
+    def calculate_available_size(max_size)
+      1024**2 * (max_size / 1.049) # Mb to Mib
     end
 
     def entries_of(compressed_file)
diff --git a/lib/theme_store/zip_importer.rb b/lib/theme_store/zip_importer.rb
index c1a4aea098..d252037ace 100644
--- a/lib/theme_store/zip_importer.rb
+++ b/lib/theme_store/zip_importer.rb
@@ -18,8 +18,9 @@ class ThemeStore::ZipImporter
     FileUtils.mkdir(@temp_folder)
 
     Dir.chdir(@temp_folder) do
+      available_size = SiteSetting.decompressed_theme_max_file_size_mb
       Compression::Engine.engine_for(@original_filename).tap do |engine|
-        engine.decompress(@temp_folder, @filename)
+        engine.decompress(@temp_folder, @filename, available_size)
         engine.strip_directory(@temp_folder, @temp_folder, relative: true)
       end
     end
diff --git a/spec/components/theme_store/zip_exporter_spec.rb b/spec/components/theme_store/zip_exporter_spec.rb
index e7df513aa8..922ae3081d 100644
--- a/spec/components/theme_store/zip_exporter_spec.rb
+++ b/spec/components/theme_store/zip_exporter_spec.rb
@@ -63,7 +63,8 @@ describe ThemeStore::ZipExporter do
     file = 'discourse-header-icons.zip'
     dest = 'discourse-header-icons'
     Dir.chdir(dir) do
-      Compression::Zip.new.decompress(dir, file, allow_non_root_folder: true)
+      available_size = SiteSetting.decompressed_theme_max_file_size_mb
+      Compression::Zip.new.decompress(dir, file, available_size, allow_non_root_folder: true)
       `rm #{file}`
 
       folders = Dir.glob("**/*").reject { |f| File.file?(f) }
diff --git a/spec/lib/compression/engine_spec.rb b/spec/lib/compression/engine_spec.rb
index 04b6f7d42e..27a161934a 100644
--- a/spec/lib/compression/engine_spec.rb
+++ b/spec/lib/compression/engine_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe Compression::Engine do
+  let(:available_size) { SiteSetting.decompressed_theme_max_file_size_mb }
+
   before do
     @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/#{SecureRandom.hex}"
     @folder_name = 'test'
@@ -36,7 +38,7 @@ describe Compression::Engine do
       it 'decompress the folder and inspect files correctly' do
         engine = described_class.engine_for(@compressed_path)
 
-        engine.decompress(@temp_folder, "#{@temp_folder}/#{@folder_name}.zip")
+        engine.decompress(@temp_folder, "#{@temp_folder}/#{@folder_name}.zip", available_size)
 
         expect(read_file("test/hello.txt")).to eq("hello world")
         expect(read_file("test/a/inner")).to eq("hello world inner")
@@ -49,7 +51,7 @@ describe Compression::Engine do
       it 'decompress the folder and inspect files correctly' do
         engine = described_class.engine_for(@compressed_path)
 
-        engine.decompress(@temp_folder, "#{@temp_folder}/#{@folder_name}.tar.gz")
+        engine.decompress(@temp_folder, "#{@temp_folder}/#{@folder_name}.tar.gz", available_size)
 
         expect(read_file("test/hello.txt")).to eq("hello world")
         expect(read_file("test/a/inner")).to eq("hello world inner")
@@ -62,7 +64,7 @@ describe Compression::Engine do
       it 'decompress the folder and inspect files correctly' do
         engine = described_class.engine_for(@compressed_path)
 
-        engine.decompress(@temp_folder, "#{@temp_folder}/#{@folder_name}.tar")
+        engine.decompress(@temp_folder, "#{@temp_folder}/#{@folder_name}.tar", available_size)
 
         expect(read_file("test/hello.txt")).to eq("hello world")
         expect(read_file("test/a/inner")).to eq("hello world inner")

From 4d67f2a8ed6b3c24ffa0cd1bdc2dcfeea8d7c847 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Fri, 11 Oct 2019 23:26:04 +0530
Subject: [PATCH 013/328] bumped plugin api version to 0.8.33 (#8185)

---
 app/assets/javascripts/discourse/lib/plugin-api.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index f54c0f4306..da8ba1cedf 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -46,7 +46,7 @@ import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.32";
+const PLUGIN_API_VERSION = "0.8.33";
 
 class PluginApi {
   constructor(version, container) {

From ee4369f9723a10d1f78838e904cde83448eb825a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Oct 2019 14:41:05 -0400
Subject: [PATCH 014/328] Hook that allows custom logic before saving the
 composer

---
 .../discourse/models/composer.js.es6          | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 9ba0afe0aa..5f13fb0940 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -744,15 +744,22 @@ const Composer = RestModel.extend({
     return false;
   },
 
-  save(opts) {
-    if (!this.cantSubmitPost) {
-      // change category may result in some effect for topic featured link
-      if (!this.canEditTopicFeaturedLink) {
-        this.set("featuredLink", null);
-      }
+  // Overwrite to implement custom logic
+  beforeSave() {
+    return Ember.RSVP.Promise.resolve();
+  },
 
-      return this.editingPost ? this.editPost(opts) : this.createPost(opts);
-    }
+  save(opts) {
+    return this.beforeSave().then(() => {
+      if (!this.cantSubmitPost) {
+        // change category may result in some effect for topic featured link
+        if (!this.canEditTopicFeaturedLink) {
+          this.set("featuredLink", null);
+        }
+
+        return this.editingPost ? this.editPost(opts) : this.createPost(opts);
+      }
+    });
   },
 
   clearState() {

From c5d03c30ca179ab893508d0aba819a3550111efb Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Oct 2019 14:54:30 -0400
Subject: [PATCH 015/328] DEV: Add a plugin API for registering a "beforeSave"
 on the composer

This allows plugins to perform operations before saves occur, and
perhaps reject the post.
---
 .../discourse/controllers/composer.js.es6     |  4 ++-
 .../discourse/lib/plugin-api.js.es6           | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index cf295cb870..c5c68d095c 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -721,7 +721,9 @@ export default Ember.Controller.extend({
       })
       .catch(error => {
         composer.set("disableDrafts", false);
-        this.appEvents.one("composer:will-open", () => bootbox.alert(error));
+        if (error) {
+          this.appEvents.one("composer:will-open", () => bootbox.alert(error));
+        }
       });
 
     if (
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index da8ba1cedf..246470af8c 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -46,7 +46,7 @@ import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.33";
+const PLUGIN_API_VERSION = "0.8.34";
 
 class PluginApi {
   constructor(version, container) {
@@ -791,7 +791,7 @@ class PluginApi {
    *
    * Example:
    *
-   * modifySelectKit("topic-footer-mobile-dropdown").appendContent(() => [{
+   * api.modifySelectKit("topic-footer-mobile-dropdown").appendContent(() => [{
    *   name: "discourse",
    *   id: 1
    * }])
@@ -807,7 +807,7 @@ class PluginApi {
    *
    * Example:
    *
-   * addGTMPageChangedCallback( gtmData => gtmData.locale = I18n.currentLocale() )
+   * api.addGTMPageChangedCallback( gtmData => gtmData.locale = I18n.currentLocale() )
    *
    */
   addGTMPageChangedCallback(fn) {
@@ -821,7 +821,7 @@ class PluginApi {
    * Example:
    *
    * // read /discourse/lib/sharing.js.es6 for options
-   * addSharingSource(options)
+   * api.addSharingSource(options)
    *
    */
   addSharingSource(options) {
@@ -837,14 +837,28 @@ class PluginApi {
    *
    * Example:
    *
-   * addComposerUploadHandler(["mp4", "mov"], (file, editor) => {
-   *    console.log("Handling upload for", file.name);
+   * api.addComposerUploadHandler(["mp4", "mov"], (file, editor) => {
+   *   console.log("Handling upload for", file.name);
    * })
    */
   addComposerUploadHandler(extensions, method) {
     addComposerUploadHandler(extensions, method);
   }
 
+  /**
+   * Registers a "beforeSave" function on the composer. This allows you to
+   * implement custom logic that will happen before the user makes a post.
+   *
+   * Example:
+   *
+   * api.composerBeforeSave(() => {
+   *   console.log("Before saving, do something!");
+   * })
+   */
+  composerBeforeSave(method) {
+    Composer.reopen({ beforeSave: method });
+  }
+
   /**
    * Adds a field to draft serializer
    *

From 342bbe66dd497a33a78ec2abd0f9c4d32c4b8851 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Oct 2019 15:33:34 -0400
Subject: [PATCH 016/328] FIX: Flaky tests

We had acceptance tests that were testing the contents of the post
stream preview, not the contents of the eventual topic itself.

This became apparent when I introduced a new promise which caused the
tests to finish waiting for work properly. Before that, it was up to the
speed of the execution, very spooky!
---
 test/javascripts/acceptance/category-hashtag-test.js.es6 | 9 +--------
 test/javascripts/acceptance/composer-test.js.es6         | 4 ++--
 test/javascripts/acceptance/emoji-test.js.es6            | 8 --------
 test/javascripts/acceptance/tag-hashtag-test.js.es6      | 8 --------
 test/javascripts/helpers/create-pretender.js.es6         | 4 +++-
 5 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js.es6
index c2ffdcdcae..e5bbdf3c48 100644
--- a/test/javascripts/acceptance/category-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/category-hashtag-test.js.es6
@@ -7,6 +7,7 @@ QUnit.test("category hashtag is cooked properly", async assert => {
   await click("#topic-footer-buttons .btn.create");
 
   await fillIn(".d-editor-input", "this is a category hashtag #bug");
+
   // TODO: Test that the autocomplete shows
   assert.equal(
     find(".d-editor-preview:visible")
@@ -14,12 +15,4 @@ QUnit.test("category hashtag is cooked properly", async assert => {
       .trim(),
     '<p>this is a category hashtag <a href="/c/bugs" class="hashtag">#<span>bug</span></a></p>'
   );
-
-  await click("#reply-control .btn.create");
-  assert.equal(
-    find(".topic-post:last .cooked p")
-      .html()
-      .trim(),
-    'this is a category hashtag <a href="/c/bugs" class="hashtag">#<span>bug</span></a>'
-  );
 });
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 26ccba2be2..5123276c48 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -249,7 +249,7 @@ QUnit.test("Create a Reply", async assert => {
   await click("#reply-control button.create");
   assert.equal(
     find(".cooked:last p").text(),
-    "this is the content of my reply"
+    "If you use gettext format you could leverage Launchpad 13 translations and the community behind it."
   );
 });
 
@@ -266,7 +266,7 @@ QUnit.test("Posting on a different topic", async assert => {
   await click(".btn-reply-here");
   assert.equal(
     find(".cooked:last p").text(),
-    "this is the content for a different topic"
+    "If you use gettext format you could leverage Launchpad 13 translations and the community behind it."
   );
 });
 
diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js.es6
index 39dc37696e..087a923906 100644
--- a/test/javascripts/acceptance/emoji-test.js.es6
+++ b/test/javascripts/acceptance/emoji-test.js.es6
@@ -14,14 +14,6 @@ QUnit.test("emoji is cooked properly", async assert => {
       .trim(),
     `<p>this is an emoji <img src="/images/emoji/emoji_one/blonde_woman.png?v=${v}" title=":blonde_woman:" class="emoji" alt=":blonde_woman:"></p>`
   );
-
-  await click("#reply-control .btn.create");
-  assert.equal(
-    find(".topic-post:last .cooked p")
-      .html()
-      .trim(),
-    `this is an emoji <img src="/images/emoji/emoji_one/blonde_woman.png?v=${v}" title=":blonde_woman:" class="emoji" alt=":blonde_woman:">`
-  );
 });
 
 QUnit.test("skin toned emoji is cooked properly", async assert => {
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js.es6
index 1e3e468277..b640d2cb97 100644
--- a/test/javascripts/acceptance/tag-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/tag-hashtag-test.js.es6
@@ -24,12 +24,4 @@ QUnit.test("tag is cooked properly", async assert => {
       .trim(),
     '<p>this is a tag hashtag <a href="/tags/monkey" class="hashtag">#<span>monkey</span></a></p>'
   );
-
-  await click("#reply-control .btn.create");
-  assert.equal(
-    find(".topic-post:last .cooked")
-      .html()
-      .trim(),
-    '<p>this is a tag hashtag <a href="/tags/monkey" class="hashtag">#<span>monkey</span></a></p>'
-  );
 });
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index cb4597482e..d05a79a491 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -199,7 +199,9 @@ export default function() {
 
     this.get("/t/280.json", () => response(fixturesByUrl["/t/280/1.json"]));
     this.get("/t/34.json", () => response(fixturesByUrl["/t/34/1.json"]));
-    this.get("/t/280/20.json", () => response(fixturesByUrl["/t/280/1.json"]));
+    this.get("/t/280/:post_number.json", () =>
+      response(fixturesByUrl["/t/280/1.json"])
+    );
     this.get("/t/28830.json", () => response(fixturesByUrl["/t/28830/1.json"]));
     this.get("/t/9.json", () => response(fixturesByUrl["/t/9/1.json"]));
     this.get("/t/12.json", () => response(fixturesByUrl["/t/12/1.json"]));

From 204cd43861336bae400213857da18f049571e864 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Oct 2019 15:41:19 -0400
Subject: [PATCH 017/328] FIX: This emoji test was broken too

---
 test/javascripts/acceptance/emoji-test.js.es6 | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js.es6
index 087a923906..3efd5f5a8f 100644
--- a/test/javascripts/acceptance/emoji-test.js.es6
+++ b/test/javascripts/acceptance/emoji-test.js.es6
@@ -27,12 +27,4 @@ QUnit.test("skin toned emoji is cooked properly", async assert => {
       .trim(),
     `<p>this is an emoji <img src="/images/emoji/emoji_one/blonde_woman/5.png?v=${v}" title=":blonde_woman:t5:" class="emoji" alt=":blonde_woman:t5:"></p>`
   );
-
-  await click("#reply-control .btn.create");
-  assert.equal(
-    find(".topic-post:last .cooked p")
-      .html()
-      .trim(),
-    `this is an emoji <img src="/images/emoji/emoji_one/blonde_woman/5.png?v=${v}" title=":blonde_woman:t5:" class="emoji" alt=":blonde_woman:t5:">`
-  );
 });

From de3db0e485528b067ebe8c3da15e6472cf46469c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Oct 2019 15:52:14 -0400
Subject: [PATCH 018/328] FIX: Remove another broken test

---
 .../acceptance/composer-test.js.es6           | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 5123276c48..004a4e2938 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -432,44 +432,6 @@ QUnit.test("Composer can toggle whispers", async assert => {
   );
 });
 
-QUnit.test("Switching composer whisper state", async assert => {
-  const menu = selectKit(".toolbar-popup-menu-options");
-
-  await visit("/t/this-is-a-test-topic/9");
-  await click(".topic-post:eq(0) button.reply");
-
-  await menu.expand();
-  await menu.selectRowByValue("toggleWhisper");
-
-  await fillIn(".d-editor-input", "this is the content of my reply");
-  await click("#reply-control button.create");
-
-  assert.ok(find(".topic-post:last").hasClass("whisper"));
-
-  await click("#topic-footer-buttons .btn.create");
-
-  assert.ok(
-    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
-    "doesn’t set topic reply as whisper"
-  );
-
-  await click(".topic-post:last button.reply");
-
-  assert.ok(find(".topic-post:last").hasClass("whisper"));
-  assert.ok(
-    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
-    "sets post reply as a whisper"
-  );
-
-  await click(".topic-post:nth-last-child(2) button.reply");
-
-  assert.notOk(find(".topic-post:nth-last-child(2)").hasClass("whisper"));
-  assert.ok(
-    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
-    "doesn’t set post reply as a whisper"
-  );
-});
-
 QUnit.test(
   "Composer can toggle layouts (open, fullscreen and draft)",
   async assert => {

From 312ecf2a05b2f29cd180463e35b7e9228fd89076 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 11 Oct 2019 22:25:28 +0200
Subject: [PATCH 019/328] FIX: allows scrolling of search menu panel when
 showing more results (#8186)

---
 app/assets/stylesheets/common/base/menu-panel.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 3b32d81874..a02fccf8b8 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -51,6 +51,7 @@
     touch-action: pan-y pinch-zoom;
     overflow-y: auto;
     overflow-x: hidden;
+    max-height: 100vh;
   }
 
   .badge-notification {

From 16d8e3f872528839b8c765fefa7b57c393b2683e Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Sat, 12 Oct 2019 20:05:34 -0700
Subject: [PATCH 020/328] minor copyedit

---
 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 59f48d8d3a..bcefb89f45 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1384,7 +1384,7 @@ en:
     editing_grace_period_max_diff_high_trust: "Maximum number of character changes allowed in editing grace period, if more changed store another post revision (trust level 2 and up)"
     staff_edit_locks_post: "Posts will be locked from editing if they are edited by staff members"
     post_edit_time_limit: "A tl0 or tl1 author can edit their post for (n) minutes after posting. Set to 0 for forever."
-    tl2_post_edit_time_limit: "A tl2 author can edit their post for (n) minutes after posting. Set to 0 for forever."
+    tl2_post_edit_time_limit: "A tl2+ author can edit their post for (n) minutes after posting. Set to 0 for forever."
     edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view."
     delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately."
     max_image_width: "Maximum thumbnail width of images in a post"

From 2b74dc5885df9b2a6fce07a643ad4e817125bb6c Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Sun, 13 Oct 2019 00:53:57 -0700
Subject: [PATCH 021/328] FIX: allow change password with TOTP

---
 .../discourse/controllers/password-reset.js.es6          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
index ae3c5949a5..4194d67f16 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
@@ -16,9 +16,12 @@ export default Ember.Controller.extend(PasswordValidation, {
     "model.second_factor_required",
     "model.security_key_required"
   ),
-  secondFactorMethod: Ember.computed.alias("model.security_key_required")
-    ? SECOND_FACTOR_METHODS.SECURITY_KEY
-    : SECOND_FACTOR_METHODS.TOTP,
+  @computed("model.security_key_required")
+  secondFactorMethod(security_key_required) {
+    return security_key_required
+      ? SECOND_FACTOR_METHODS.SECURITY_KEY
+      : SECOND_FACTOR_METHODS.TOTP;
+  },
   passwordRequired: true,
   errorMessage: null,
   successMessage: null,

From e4fe864c0b7d4d5d1f0cd604829eca81b71bb4ec Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 14 Oct 2019 08:47:15 +0530
Subject: [PATCH 022/328] FIX: use upload's cdn url in composer preview if
 available.

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

diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index 9c898882a7..417600469b 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -70,7 +70,7 @@ module PrettyText
           if short_urls = reverse_map[sha1]
             short_urls.each do |short_url|
               result[short_url] = {
-                url: url,
+                url: Discourse.store.cdn_url(url),
                 short_path: Upload.short_path(sha1: sha1, extension: extension),
                 base62_sha1: Upload.base62_sha1(sha1)
               }

From 99086edf855df3fb8de5887785ddc687a6911810 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Mon, 14 Oct 2019 15:40:33 +1100
Subject: [PATCH 023/328] FIX: Allow themes to upload and serve js files
 (#8188)

If you set `config.public_file_server.enabled = false` when you try to get uploaded js file you will get an error:
`Security warning: an embedded <script> tag on another site requested protected JavaScript. If you know what you're doing, go ahead and disable forgery protection on this action to permit cross-origin JavaScript embedding.`

The reason is that content type is `application/javascript` and in Rails 5 guard looked like that:
https://github.com/rails/rails/blob/5-2-stable/actionpack/lib/action_controller/metal/request_forgery_protection.rb#L278-L280
However, in Rails 6 `application` was added to regex:
https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/request_forgery_protection.rb#L282-L284

This pull request is related to https://meta.discourse.org/t/uploaded-js-file-for-theme-causes-a-rejection/129753/8
---
 app/controllers/uploads_controller.rb    | 1 +
 spec/fixtures/themes/test.js             | 1 +
 spec/requests/uploads_controller_spec.rb | 7 +++++++
 3 files changed, 9 insertions(+)
 create mode 100644 spec/fixtures/themes/test.js

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 78c1623704..78fd13c8eb 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -6,6 +6,7 @@ class UploadsController < ApplicationController
   requires_login except: [:show, :show_short]
 
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short]
+  protect_from_forgery except: :show
 
   def create
     # capture current user for block later on
diff --git a/spec/fixtures/themes/test.js b/spec/fixtures/themes/test.js
new file mode 100644
index 0000000000..14c198cadb
--- /dev/null
+++ b/spec/fixtures/themes/test.js
@@ -0,0 +1 @@
+console.log("test");
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index d779898e5f..cb738c73ea 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -265,6 +265,13 @@ describe UploadsController do
         .to eq(%Q|attachment; filename="logo.png"; filename*=UTF-8''logo.png|)
     end
 
+    it 'returns 200 when js file' do
+      ActionDispatch::FileHandler.any_instance.stubs(:match?).returns(false)
+      upload = upload_file("test.js", "themes")
+      get upload.url
+      expect(response.status).to eq(200)
+    end
+
     it "handles image without extension" do
       SiteSetting.authorized_extensions = "*"
       upload = upload_file("image_no_extension")

From f92a6f7ac5228342177bf089d269e2f69a69e2f5 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 14 Oct 2019 11:39:16 +0530
Subject: [PATCH 024/328] FIX: 'local_cdn_url' method should work for local
 relative urls too.

---
 lib/url_helper.rb                  |  6 +++++-
 spec/components/url_helper_spec.rb | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/url_helper.rb b/lib/url_helper.rb
index 0c69d28782..b156013295 100644
--- a/lib/url_helper.rb
+++ b/lib/url_helper.rb
@@ -71,7 +71,11 @@ class UrlHelper
 
   def self.local_cdn_url(url)
     return url if Discourse.asset_host.blank?
-    url.sub(Discourse.base_url_no_prefix, Discourse.asset_host)
+    if url.start_with?("/#{Discourse.store.upload_path}/")
+      "#{Discourse.asset_host}#{url}"
+    else
+      url.sub(Discourse.base_url_no_prefix, Discourse.asset_host)
+    end
   end
 
 end
diff --git a/spec/components/url_helper_spec.rb b/spec/components/url_helper_spec.rb
index 53da4a688d..77ae944249 100644
--- a/spec/components/url_helper_spec.rb
+++ b/spec/components/url_helper_spec.rb
@@ -119,4 +119,15 @@ describe UrlHelper do
     end
   end
 
+  describe "#local_cdn_url" do
+    let(:url) { "/uploads/default/1X/575bcc2886bf7a39684b57ca90be85f7d399bbc7.png" }
+    let(:asset_host) { "//my.awesome.cdn" }
+
+    it "should return correct cdn url for local relative urls" do
+      Discourse.stubs(:asset_host).returns(asset_host)
+      cdn_url = UrlHelper.local_cdn_url(url)
+      expect(cdn_url).to eq("#{asset_host}#{url}")
+    end
+  end
+
 end

From 815edf6f4dbe8fe4b390ea904401a7dccb478c14 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 14 Oct 2019 11:39:14 +0530
Subject: [PATCH 025/328] FEATURE: add short site description on login page
 title

---
 .../javascripts/discourse/routes/application.js.es6       | 3 ++-
 app/controllers/static_controller.rb                      | 8 ++++++++
 app/views/static/login.html.erb                           | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 4c85a42862..a84291b46c 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -43,7 +43,8 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     _collectTitleTokens(tokens) {
       tokens.push(this.siteTitle);
       if (
-        window.location.pathname === Discourse.getURL("/") &&
+        (window.location.pathname === Discourse.getURL("/") ||
+          window.location.pathname === Discourse.getURL("/login")) &&
         this.shortSiteDescription !== ""
       ) {
         tokens.push(this.shortSiteDescription);
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 51b291403c..c0bdc032f4 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -51,6 +51,14 @@ class StaticController < ApplicationController
       return
     end
 
+    unless @title.present?
+      @title = if SiteSetting.short_site_description.present?
+        "#{SiteSetting.title} - #{SiteSetting.short_site_description}"
+      else
+        SiteSetting.title
+      end
+    end
+
     if I18n.exists?("static.#{@page}")
       render html: I18n.t("static.#{@page}"), layout: !request.xhr?, formats: [:html]
       return
diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb
index 22953acf0b..f0128a9dd1 100644
--- a/app/views/static/login.html.erb
+++ b/app/views/static/login.html.erb
@@ -4,6 +4,7 @@
   </div>
 <% end %>
 
+<% content_for :title do %><%= @title %><% end %>
 <% content_for :head do %>
-  <%= raw crawlable_meta_data(title: SiteSetting.title, description: SiteSetting.site_description) %>
+  <%= raw crawlable_meta_data(title: @title, description: SiteSetting.site_description) %>
 <% end %>

From 129e308dacbdb1e473b5e2a2a9c6cdd01b37bf34 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 14 Oct 2019 12:49:11 +0530
Subject: [PATCH 026/328] fix the incorrect specs

Previously the 'local_cdn_url' method didn't returned the correct cdn url. So we written few incorrect spec tests too.\n\nf92a6f7ac5228342177bf089d269e2f69a69e2f5
---
 spec/components/pretty_text_spec.rb | 12 +++++++-----
 spec/components/url_helper_spec.rb  |  2 +-
 spec/models/post_spec.rb            |  7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index dc14832232..fccb0d3ad7 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -1378,21 +1378,23 @@ HTML
       [some attachment|random](#{upload.short_url})
       RAW
 
+      cdn_url = Discourse.store.cdn_url(upload.url)
+
       cooked = <<~HTML
-        <p><img src="#{upload.url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></p>
-        <p><img src="#{upload.url}" alt="upload" title="some title to test" data-base62-sha1="#{upload.base62_sha1}"></p>
+        <p><img src="#{cdn_url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></p>
+        <p><img src="#{cdn_url}" alt="upload" title="some title to test" data-base62-sha1="#{upload.base62_sha1}"></p>
         <ul>
         <li>
-        <p><img src="#{upload.url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></p>
+        <p><img src="#{cdn_url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></p>
         </li>
         <li>
         <p>test</p>
         <ul>
-        <li><img src="#{upload.url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></li>
+        <li><img src="#{cdn_url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></li>
         </ul>
         </li>
         </ul>
-        <p><img src="#{upload.url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></p>
+        <p><img src="#{cdn_url}" alt="upload" data-base62-sha1="#{upload.base62_sha1}"></p>
         <p><a href="#{upload.short_path}">some attachment</a></p>
         <p><a class="attachment" href="#{upload.short_path}">some attachment</a></p>
         <p><a href="#{upload.short_path}">some attachment|random</a></p>
diff --git a/spec/components/url_helper_spec.rb b/spec/components/url_helper_spec.rb
index 77ae944249..4d86341fe5 100644
--- a/spec/components/url_helper_spec.rb
+++ b/spec/components/url_helper_spec.rb
@@ -124,7 +124,7 @@ describe UrlHelper do
     let(:asset_host) { "//my.awesome.cdn" }
 
     it "should return correct cdn url for local relative urls" do
-      Discourse.stubs(:asset_host).returns(asset_host)
+      set_cdn_url asset_host
       cdn_url = UrlHelper.local_cdn_url(url)
       expect(cdn_url).to eq("#{asset_host}#{url}")
     end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 92d4aafad1..d035fdfac4 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1367,6 +1367,7 @@ describe Post do
       upload1 = Fabricate(:upload)
       upload2 = Fabricate(:upload)
       upload3 = Fabricate(:video_upload)
+      upload4 = Fabricate(:upload)
 
       set_cdn_url "https://awesome.com/somepath"
 
@@ -1375,7 +1376,7 @@ describe Post do
 
       ![](#{upload1.short_url})
 
-      "#{GlobalSetting.cdn_url}#{upload1.url}"
+      "#{GlobalSetting.cdn_url}#{upload4.url}"
 
       <a href='#{Discourse.base_url}#{upload2.url}'>Link to upload</a>
       ![](http://example.com/external.png)
@@ -1392,15 +1393,15 @@ describe Post do
       end
 
       expect(urls).to contain_exactly(
-        upload1.url,
         "#{GlobalSetting.cdn_url}#{upload1.url}",
+        "#{GlobalSetting.cdn_url}#{upload4.url}",
         "#{Discourse.base_url}#{upload2.url}",
         "#{Discourse.base_url}#{upload3.short_path}"
       )
 
       expect(paths).to contain_exactly(
         upload1.url,
-        upload1.url,
+        upload4.url,
         upload2.url,
         nil
       )

From 519fe290e3f6bef6bfe97f8869a54a7cafb55d8f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 14 Oct 2019 12:57:33 +0530
Subject: [PATCH 027/328] SPEC: 'lookup_upload_urls' method should use cdn url
 if available.

e4fe864c0b7d4d5d1f0cd604829eca81b71bb4ec
---
 spec/components/pretty_text/helpers_spec.rb | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 spec/components/pretty_text/helpers_spec.rb

diff --git a/spec/components/pretty_text/helpers_spec.rb b/spec/components/pretty_text/helpers_spec.rb
new file mode 100644
index 0000000000..1f5c882cd1
--- /dev/null
+++ b/spec/components/pretty_text/helpers_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe PrettyText::Helpers do
+
+  context "lookup_upload_urls" do
+    let(:upload) { Fabricate(:upload) }
+
+    it "should return cdn url if available" do
+      short_url = upload.short_url
+      result = PrettyText::Helpers.lookup_upload_urls([short_url])
+      expect(result[short_url][:url]).to eq(upload.url)
+
+      set_cdn_url "https://awesome.com"
+
+      result = PrettyText::Helpers.lookup_upload_urls([short_url])
+      expect(result[short_url][:url]).to eq("https://awesome.com#{upload.url}")
+    end
+  end
+
+end

From 5b84307774e4b10ffe760d1758d15ed0f73b9aec Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 14 Oct 2019 12:14:16 +0300
Subject: [PATCH 028/328] FIX: Ensure that scheduled jobs are loaded. (#8183)

In development, the scheduled jobs are loaded lazily and MiniScheduler
cannot discover them (/sidekiq/scheduler does not show any jobs).
---
 config/initializers/100-sidekiq.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index 9f41ec5799..1c95cdbe83 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
+# Ensure that scheduled jobs are loaded before mini_scheduler is configured.
+if Rails.env == "development"
+  require "jobs/base"
+  Dir.glob("#{Rails.root}/app/jobs/scheduled/*.rb") do |f|
+    load(f)
+  end
+end
+
 require "sidekiq/pausable"
 
 Sidekiq.configure_client do |config|

From 96b8710b392c7289bdb426bc3a56bdb6b7e400fb Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 14 Oct 2019 12:25:31 +0300
Subject: [PATCH 029/328] DEV: Fix heisentest (ensure that user ID really does
 not exist).

---
 spec/jobs/user_email_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 39844fdb17..263adba7e3 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -30,7 +30,7 @@ describe Jobs::UserEmail do
     fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:admin), created_at: 1.hour.ago) }
 
     it "doesn't call the mailer when the user is missing" do
-      Jobs::UserEmail.new.execute(type: :digest, user_id: 1234)
+      Jobs::UserEmail.new.execute(type: :digest, user_id: User.last.id + 10000)
       expect(ActionMailer::Base.deliveries).to eq([])
     end
 

From 086b46051cfb18e78a5e4ca004d23ee84dfd229f Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 14 Oct 2019 13:03:22 +0300
Subject: [PATCH 030/328] FIX: Zeitwerk-related fixes for jobs. (#8187)

---
 app/jobs/base.rb                                            | 2 +-
 app/jobs/onceoff/retro_grant_anniversary.rb                 | 2 +-
 app/jobs/regular/notify_mailing_list_subscribers.rb         | 2 +-
 app/jobs/regular/user_email.rb                              | 2 +-
 app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb | 2 +-
 app/jobs/scheduled/heartbeat.rb                             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index 9ad78f4564..b43bcb5729 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -282,7 +282,7 @@ module Jobs
   end
 
   def self.enqueue(job_name, opts = {})
-    klass = "Jobs::#{job_name.to_s.camelcase}".constantize
+    klass = "::Jobs::#{job_name.to_s.camelcase}".constantize
 
     # Unless we want to work on all sites
     unless opts.delete(:all_sites)
diff --git a/app/jobs/onceoff/retro_grant_anniversary.rb b/app/jobs/onceoff/retro_grant_anniversary.rb
index dd73fe215f..b0ca206bff 100644
--- a/app/jobs/onceoff/retro_grant_anniversary.rb
+++ b/app/jobs/onceoff/retro_grant_anniversary.rb
@@ -8,7 +8,7 @@ module Jobs
 
       # Fill in the years of anniversary badges we missed
       (2..3).each do |year|
-        Jobs::GrantAnniversaryBadges.new.execute(start_date: year.years.ago)
+        ::Jobs::GrantAnniversaryBadges.new.execute(start_date: year.years.ago)
       end
     end
   end
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index ba63d13af2..c4dfacfb32 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -16,7 +16,7 @@ module Jobs
       when SocketError
         RETRY_TIMES[count]
       else
-        Jobs::UserEmail.seconds_to_delay(count)
+        ::Jobs::UserEmail.seconds_to_delay(count)
       end
     end
 
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index 5bdea4fb86..dcc0059d9f 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -189,7 +189,7 @@ module Jobs
       when Net::SMTPServerBusy
         1.hour + (rand(30) * (count + 1))
       else
-        Jobs::UserEmail.seconds_to_delay(count)
+        ::Jobs::UserEmail.seconds_to_delay(count)
       end
     end
 
diff --git a/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb b/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb
index 6352c92857..12d947ec21 100644
--- a/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb
+++ b/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb
@@ -5,7 +5,7 @@ module Jobs
     every 1.day
 
     def execute(args)
-      Jobs::MigrateUrlSiteSettings::SETTINGS.each do |old_setting, new_setting|
+      ::Jobs::MigrateUrlSiteSettings::SETTINGS.each do |old_setting, new_setting|
         if SiteSetting.where("name = ? AND value IS NOT NULL", new_setting).exists?
           SiteSetting.set(old_setting, nil, warn: false)
           SiteSetting.find_by(name: old_setting).destroy!
diff --git a/app/jobs/scheduled/heartbeat.rb b/app/jobs/scheduled/heartbeat.rb
index 0f0d9fc020..16ab8b77bb 100644
--- a/app/jobs/scheduled/heartbeat.rb
+++ b/app/jobs/scheduled/heartbeat.rb
@@ -7,7 +7,7 @@ module Jobs
     every 3.minute
 
     def execute(args)
-      Jobs.enqueue(:run_heartbeat, {})
+      ::Jobs.enqueue(:run_heartbeat, {})
     end
   end
 end

From f1742617fb793bb9ae81e22f111c9dbf8f0d9427 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 11 Oct 2019 17:31:20 +0200
Subject: [PATCH 031/328] PERF: Faster moving of read state

This should improve the performance of moving the read state of lots of posts to a new/existing topic.
---
 app/models/post_mover.rb | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 6b779edf6b..7094f317a5 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -333,32 +333,37 @@ class PostMover
                  WHERE p.topic_id = tu.topic_id
                    AND p.user_id = tu.user_id
                )                                         AS posted,
-             MAX(lr.new_post_number)                     AS last_read_post_number,
-             MAX(hs.new_post_number)                     AS highest_seen_post_number,
-             MAX(le.new_post_number)                     AS last_emailed_post_number,
+             (
+               SELECT MAX(lr.new_post_number)
+               FROM moved_posts lr
+               WHERE lr.old_topic_id = tu.topic_id
+                 AND lr.old_post_number <= tu.last_read_post_number
+             )                                           AS last_read_post_number,
+             (
+               SELECT MAX(hs.new_post_number)
+               FROM moved_posts hs
+               WHERE hs.old_topic_id = tu.topic_id
+                 AND hs.old_post_number <= tu.highest_seen_post_number
+             )                                           AS highest_seen_post_number,
+             (
+               SELECT MAX(le.new_post_number)
+               FROM moved_posts le
+               WHERE le.old_topic_id = tu.topic_id
+                 AND le.old_post_number <= tu.last_emailed_post_number
+             )                                           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,
              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 moved_posts lr
-                           ON (lr.old_topic_id = tu.topic_id AND lr.old_post_number <= tu.last_read_post_number)
-           LEFT OUTER JOIN moved_posts hs
-                           ON (hs.old_topic_id = tu.topic_id AND hs.old_post_number <= tu.highest_seen_post_number)
-           LEFT OUTER JOIN moved_posts le
-                           ON (le.old_topic_id = tu.topic_id AND le.old_post_number <= tu.last_emailed_post_number)
+           JOIN topics t ON (t.id = :new_topic_id)
       WHERE tu.topic_id = :old_topic_id
         AND GREATEST(
                 tu.last_read_post_number,
                 tu.highest_seen_post_number,
                 tu.last_emailed_post_number
               ) >= (SELECT MIN(old_post_number) FROM moved_posts)
-      GROUP BY tu.topic_id, tu.user_id, tu.first_visited_at, tu.last_visited_at, t.created_at, tu.notification_level,
-               tu.notifications_changed_at,
-               tu.notifications_reason_id
       ON CONFLICT (topic_id, user_id) DO UPDATE
         SET posted                   = excluded.posted,
             last_read_post_number    = CASE

From 2c011252f1c0443965ca5317169550083a43c657 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 14 Oct 2019 15:05:59 +0200
Subject: [PATCH 032/328] FIX: Move notification level only when user posted

Moving posts also moves the read state (`topic_users` table) to the destination topic. This changes that behavior so that only users who posted in the destination topic will have the original notification level (probably "watching") of the original topic. The notification level for all other users will be set to "regular".
---
 app/models/post_mover.rb       | 22 ++++++++++++++--------
 spec/models/post_mover_spec.rb | 31 +++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 7094f317a5..2cd39b80ae 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -318,7 +318,8 @@ 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
+      old_highest_staff_post_number: destination_topic.highest_staff_post_number,
+      default_notification_level: NotificationLevels.topic_levels[:regular]
     }
 
     DB.exec(<<~SQL, params)
@@ -327,12 +328,9 @@ class PostMover
                               notifications_changed_at, notifications_reason_id)
       SELECT tu.user_id,
              :new_topic_id                               AS topic_id,
-             EXISTS(
-                 SELECT 1
-                 FROM posts p
-                 WHERE p.topic_id = tu.topic_id
-                   AND p.user_id = tu.user_id
-               )                                         AS posted,
+             CASE
+               WHEN p.user_id IS NULL THEN FALSE
+               ELSE TRUE END                             AS posted,
              (
                SELECT MAX(lr.new_post_number)
                FROM moved_posts lr
@@ -353,11 +351,19 @@ 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,
-             tu.notification_level,
+             CASE
+               WHEN p.user_id IS NOT NULL THEN tu.notification_level
+               ELSE :default_notification_level END      AS 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 604fcc4154..78c1cc72ad 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -387,6 +387,13 @@ describe PostMover do
                 last_emailed_post_number: 3,
                 notification_level: :tracking
               )
+              create_topic_user(
+                user2,
+                last_read_post_number: 2,
+                highest_seen_post_number: 2,
+                last_emailed_post_number: 2,
+                notification_level: :tracking
+              )
               create_topic_user(
                 user3,
                 last_read_post_number: 1,
@@ -395,9 +402,10 @@ describe PostMover do
                 notification_level: :watching
               )
 
+              p2.update!(user_id: user2.id)
               new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name")
 
-              expect(TopicUser.where(topic_id: topic.id).count).to eq(3)
+              expect(TopicUser.where(topic_id: topic.id).count).to eq(4)
               expect(TopicUser.find_by(topic: topic, user: user))
                 .to have_attributes(
                       last_read_post_number: 4,
@@ -412,6 +420,13 @@ describe PostMover do
                       last_emailed_post_number: 3,
                       notification_level: TopicUser.notification_levels[:tracking]
                     )
+              expect(TopicUser.find_by(topic: topic, user: user2))
+                .to have_attributes(
+                      last_read_post_number: 2,
+                      highest_seen_post_number: 2,
+                      last_emailed_post_number: 2,
+                      notification_level: TopicUser.notification_levels[:tracking]
+                    )
               expect(TopicUser.find_by(topic: topic, user: user3))
                 .to have_attributes(
                       last_read_post_number: 1,
@@ -420,7 +435,7 @@ describe PostMover do
                       notification_level: TopicUser.notification_levels[:watching]
                     )
 
-              expect(TopicUser.where(topic_id: new_topic.id).count).to eq(3)
+              expect(TopicUser.where(topic_id: new_topic.id).count).to eq(4)
               expect(TopicUser.find_by(topic: new_topic, user: user))
                 .to have_attributes(
                       last_read_post_number: 1,
@@ -434,15 +449,23 @@ describe PostMover do
                       last_read_post_number: 2,
                       highest_seen_post_number: 2,
                       last_emailed_post_number: 2,
-                      notification_level: TopicUser.notification_levels[:tracking],
+                      notification_level: TopicUser.notification_levels[:regular],
                       posted: false
                     )
+              expect(TopicUser.find_by(topic: new_topic, user: user2))
+                .to have_attributes(
+                      last_read_post_number: 2,
+                      highest_seen_post_number: 2,
+                      last_emailed_post_number: 2,
+                      notification_level: TopicUser.notification_levels[:tracking],
+                      posted: true
+                    )
               expect(TopicUser.find_by(topic: new_topic, user: user3))
                 .to have_attributes(
                       last_read_post_number: 1,
                       highest_seen_post_number: 2,
                       last_emailed_post_number: 2,
-                      notification_level: TopicUser.notification_levels[:watching],
+                      notification_level: TopicUser.notification_levels[:regular],
                       posted: false
                     )
             end

From 392f6cdf336261f9ec1cc0b6b6ce71366665cbcb Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 14 Oct 2019 16:26:48 +0100
Subject: [PATCH 033/328] DEV: Stop overriding computed property on
 `models/category.js.es6`

This causes an Ember deprecation notice, and is a confusing pattern. We never used the default values, so there is no benefit to including them.
---
 .../javascripts/discourse/models/category.js.es6      | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 5b663c48a0..8f53b70f5d 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -5,6 +5,8 @@ import { on } from "ember-addons/ember-computed-decorators";
 import PermissionType from "discourse/models/permission-type";
 
 const Category = RestModel.extend({
+  permissions: null,
+
   @on("init")
   setupGroupsAndPermissions() {
     const availableGroups = this.available_groups;
@@ -161,15 +163,6 @@ const Category = RestModel.extend({
     this.availableGroups.addObject(permission.group_name);
   },
 
-  @computed
-  permissions() {
-    return Ember.A([
-      { group_name: "everyone", permission: PermissionType.create({ id: 1 }) },
-      { group_name: "admins", permission: PermissionType.create({ id: 2 }) },
-      { group_name: "crap", permission: PermissionType.create({ id: 3 }) }
-    ]);
-  },
-
   @computed("topics")
   latestTopic(topics) {
     if (topics && topics.length) {

From 9845963105c03ab50b7443667e0e1a21855e125a Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Mon, 14 Oct 2019 15:21:17 -0300
Subject: [PATCH 034/328] FEATURE: Use the 'ugc' rel attribute alongside
 'nofollow'

---
 Gemfile                                                       | 2 +-
 Gemfile.lock                                                  | 4 ++--
 .../discourse/lib/render-topic-featured-link.js.es6           | 2 +-
 .../discourse/templates/components/image-uploader.hbs         | 2 +-
 .../discourse/templates/components/user-card-contents.hbs     | 2 +-
 app/assets/javascripts/discourse/templates/user.hbs           | 2 +-
 app/assets/javascripts/discourse/templates/user/summary.hbs   | 2 +-
 app/assets/javascripts/discourse/widgets/topic-map.js.es6     | 2 +-
 app/assets/javascripts/pretty-text/white-lister.js.es6        | 1 +
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index fe9faf36a4..1319c51438 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.9.17'
+gem 'onebox', '1.9.18'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 89de47af23..68169948e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,7 +245,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.17)
+    onebox (1.9.18)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -501,7 +501,7 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.9.17)
+  onebox (= 1.9.18)
   openid-redis-store
   parallel_tests
   pg
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.es6
index 7fa722a28d..bcf13b115a 100644
--- a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
@@ -21,7 +21,7 @@ export function extractLinkMeta(topic) {
     target: target,
     href,
     domain: topic.get("featured_link_root_domain"),
-    rel: "nofollow"
+    rel: "nofollow ugc"
   };
 
   if (_decorators.length) {
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 4c9b410290..24f33864fe 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -28,7 +28,7 @@
     <a class="lightbox"
        href={{imageCDNURL}}
        title={{imageFilename}}
-       rel="nofollow noopener">
+       rel="nofollow ugc noopener">
 
       <div class="meta">
         <span class="informations">
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 de207170d2..96ec1845a5 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -151,7 +151,7 @@
               <span class='website-name'>
                 {{d-icon "globe"}}
                 {{#if linkWebsite}}
-                  <a href="{{user.website}}" rel={{unless removeNoFollow 'nofollow noopener'}}
+                  <a href="{{user.website}}" rel={{unless removeNoFollow 'nofollow ugc noopener'}}
                    target="_blank">{{user.website_name}}</a>
                 {{else}}
                   <span title={{user.website}}>{{user.website_name}}</span>
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 8fbc7b440f..43250c97d0 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -98,7 +98,7 @@
             <div class="user-profile-website">
               {{d-icon "globe"}}
               {{#if linkWebsite}}
-                <a href={{model.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{model.website_name}}</a>
+                <a href={{model.website}} rel={{unless removeNoFollow 'nofollow ugc noopener'}} 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 c094329eca..e751d80e96 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -80,7 +80,7 @@
               <a class='domain'
                  href='{{unbound link.url}}'
                  title='{{unbound link.title}}'
-                 rel='{{unless user.removeNoFollow 'nofollow noopener'}}'
+                 rel='{{unless user.removeNoFollow 'nofollow ugc noopener'}}'
                  target='_blank'>
                 {{shorten-url link.url}}
               </a>
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index 99d3d3cee7..fcd719fcb9 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -247,7 +247,7 @@ createWidget("topic-map-link", {
       "data-user-id": attrs.user_id,
       "data-ignore-post-id": "true",
       title: attrs.url,
-      rel: "nofollow noopener"
+      rel: "nofollow ugc noopener"
     };
   },
 
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 5ea109398b..5fd4f3cb27 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -126,6 +126,7 @@ const DEFAULT_LIST = [
   "a[data-bbcode]",
   "a[name]",
   "a[rel=nofollow]",
+  "a[rel=ugc]",
   "a[target=_blank]",
   "a[title]",
   "abbr[title]",

From c49b20a1a2cdf8b697979d744d88e574e102ae3c Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 11 Oct 2019 13:31:58 +0100
Subject: [PATCH 035/328] FIX: Validation of category tree depth

This prevents the creation of sub-sub-categories in multiple tabs
---
 app/models/category.rb       | 64 ++++++++++++++++++++++--
 spec/models/category_spec.rb | 95 ++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+), 3 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index a7d2fe10a1..0037cc96b4 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -12,6 +12,7 @@ class Category < ActiveRecord::Base
   include AnonCacheInvalidator
   include HasDestroyedWebHook
 
+  MAX_NESTING = 2 # category + subcategory
   REQUIRE_TOPIC_APPROVAL = 'require_topic_approval'
   REQUIRE_REPLY_APPROVAL = 'require_reply_approval'
   NUM_AUTO_BUMP_DAILY = 'num_auto_bump_daily'
@@ -320,13 +321,70 @@ class Category < ActiveRecord::Base
     MessageBus.publish('/categories', deleted_categories: [self.id])
   end
 
+  # This is used in a validation so has to produce accurate results before the
+  # record has been saved
+  def height_of_ancestors(max_height = MAX_NESTING)
+    parent_id = self.parent_category_id
+
+    return max_height if parent_id == id
+
+    DB.query(<<~SQL, id: id, parent_id: parent_id, max_height: max_height)[0].max
+      WITH RECURSIVE ancestors(parent_category_id, height) AS (
+        SELECT :parent_id :: integer, 0
+
+        UNION ALL
+
+        SELECT
+          categories.parent_category_id,
+          CASE
+            WHEN categories.parent_category_id = :id THEN :max_height
+            ELSE ancestors.height + 1
+          END
+        FROM categories, ancestors
+        WHERE categories.id = ancestors.parent_category_id
+        AND ancestors.height < :max_height
+      )
+
+      SELECT max(height) FROM ancestors
+    SQL
+  end
+
+  # This is used in a validation so has to produce accurate results before the
+  # record has been saved
+  def depth_of_descendants(max_depth = MAX_NESTING)
+    parent_id = self.parent_category_id
+
+    return max_depth if parent_id == id
+
+    DB.query(<<~SQL, id: id, parent_id: parent_id, max_depth: max_depth)[0].max
+      WITH RECURSIVE descendants(id, depth) AS (
+        SELECT :id :: integer, 0
+
+        UNION ALL
+
+        SELECT
+          categories.id,
+          CASE
+            WHEN categories.id = :parent_id THEN :max_depth
+            ELSE descendants.depth + 1
+          END
+        FROM categories, descendants
+        WHERE categories.parent_category_id = descendants.id
+        AND descendants.depth < :max_depth
+      )
+
+      SELECT max(depth) FROM descendants
+    SQL
+  end
+
   def parent_category_validator
     if parent_category_id
-      errors.add(:base, I18n.t("category.errors.self_parent")) if parent_category_id == id
       errors.add(:base, I18n.t("category.errors.uncategorized_parent")) if uncategorized?
 
-      grandfather_id = Category.where(id: parent_category_id).pluck(:parent_category_id).first
-      errors.add(:base, I18n.t("category.errors.depth")) if grandfather_id
+      errors.add(:base, I18n.t("category.errors.self_parent")) if parent_category_id == id
+
+      total_depth = height_of_ancestors + 1 + depth_of_descendants
+      errors.add(:base, I18n.t("category.errors.depth")) if total_depth > MAX_NESTING
     end
   end
 
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 581d20b82e..dcbfe2b788 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -937,6 +937,101 @@ describe Category do
     end
   end
 
+  describe "tree metrics" do
+    fab!(:category) do
+      Category.create!(
+        user: user,
+        name: "foo"
+      )
+    end
+
+    fab!(:subcategory) do
+      Category.create!(
+        user: user,
+        name: "bar",
+        parent_category: category
+      )
+    end
+
+    context "with a self-parent" do
+      before_all do
+        DB.exec(<<-SQL, id: category.id)
+          UPDATE categories
+          SET parent_category_id = :id
+          WHERE id = :id
+        SQL
+      end
+
+      context "#depth_of_descendants" do
+        it "should produce max_depth" do
+          expect(category.depth_of_descendants(3)).to eq(3)
+        end
+      end
+
+      context "#height_of_ancestors" do
+        it "should produce max_height" do
+          expect(category.height_of_ancestors(3)).to eq(3)
+        end
+      end
+    end
+
+    context "with a prospective self-parent" do
+      before do
+        category.parent_category_id = category.id
+      end
+
+      context "#depth_of_descendants" do
+        it "should produce max_depth" do
+          expect(category.depth_of_descendants(3)).to eq(3)
+        end
+      end
+
+      context "#height_of_ancestors" do
+        it "should produce max_height" do
+          expect(category.height_of_ancestors(3)).to eq(3)
+        end
+      end
+    end
+
+    context "with a prospective loop" do
+      before do
+        category.parent_category_id = subcategory.id
+      end
+
+      context "#depth_of_descendants" do
+        it "should produce max_depth" do
+          expect(category.depth_of_descendants(3)).to eq(3)
+        end
+      end
+
+      context "#height_of_ancestors" do
+        it "should produce max_height" do
+          expect(category.height_of_ancestors(3)).to eq(3)
+        end
+      end
+    end
+
+    context "#depth_of_descendants" do
+      it "should be 0 when the category has no descendants" do
+        expect(subcategory.depth_of_descendants).to eq(0)
+      end
+
+      it "should be 1 when the category has a descendant" do
+        expect(category.depth_of_descendants).to eq(1)
+      end
+    end
+
+    context "#height_of_ancestors" do
+      it "should be 0 when the category has no ancestors" do
+        expect(category.height_of_ancestors).to eq(0)
+      end
+
+      it "should be 1 when the category has an ancestor" do
+        expect(subcategory.height_of_ancestors).to eq(1)
+      end
+    end
+  end
+
   describe "#ensure_consistency!" do
     it "creates category topic" do
 

From 0de7e4339c72c993835a30273752a12e4e956fb8 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 14 Oct 2019 18:47:15 +0100
Subject: [PATCH 036/328] FIX: Subcategory permissions validation

When a category has a subcategory, we ensure that no one who can see the
subcategory cannot see the parent. However, we don't take into account
the fact that, when no CategoryGroups exist, the default is that
everyone has full permissions.
---
 app/models/category.rb       | 25 +++++++++++++++++++++----
 spec/models/category_spec.rb | 17 +++++++++++++++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 0037cc96b4..c0f66dbea9 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -802,10 +802,27 @@ class Category < ActiveRecord::Base
   end
 
   def subcategories_permissions
-    CategoryGroup.joins(:category)
-      .where(['categories.parent_category_id = ?', self.id])
-      .pluck(:group_id, :permission_type)
-      .uniq
+    everyone = Group[:everyone].id
+    full = CategoryGroup.permission_types[:full]
+
+    result =
+      DB.query(<<-SQL, id: id, everyone: everyone, full: full)
+        SELECT category_groups.group_id, category_groups.permission_type
+        FROM categories, category_groups
+        WHERE categories.parent_category_id = :id
+        AND categories.id = category_groups.category_id
+        UNION
+        SELECT :everyone, :full
+        FROM categories
+        WHERE categories.parent_category_id = :id
+        AND (
+          SELECT DISTINCT 1
+          FROM category_groups
+          WHERE category_groups.category_id = categories.id
+        ) IS NULL
+      SQL
+
+    result.map { |row| [row.group_id, row.permission_type] }
   end
 end
 
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index dcbfe2b788..35a58303df 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -870,10 +870,12 @@ describe Category do
     fab!(:group2) { Fabricate(:group) }
     fab!(:parent_category) { Fabricate(:category_with_definition, name: "parent") }
     fab!(:subcategory) { Fabricate(:category_with_definition, name: "child1", parent_category_id: parent_category.id) }
-    fab!(:subcategory2) { Fabricate(:category_with_definition, name: "child2", parent_category_id: parent_category.id) }
 
     context "when changing subcategory permissions" do
       it "it is not valid if permissions are less restrictive" do
+        subcategory.set_permissions(group => :readonly)
+        subcategory.save!
+
         parent_category.set_permissions(group => :readonly)
         parent_category.save!
 
@@ -884,6 +886,9 @@ describe Category do
       end
 
       it "is valid if permissions are same or more restrictive" do
+        subcategory.set_permissions(group => :full, group2 => :create_post)
+        subcategory.save!
+
         parent_category.set_permissions(group => :full, group2 => :create_post)
         parent_category.save!
 
@@ -903,7 +908,9 @@ describe Category do
     end
 
     context "when changing parent category permissions" do
-      it "it is not valid if subcategory permissions are less restrictive" do
+      fab!(:subcategory2) { Fabricate(:category_with_definition, name: "child2", parent_category_id: parent_category.id) }
+
+      it "is not valid if subcategory permissions are less restrictive" do
         subcategory.set_permissions(group => :create_post)
         subcategory.save!
         subcategory2.set_permissions(group => :create_post, group2 => :create_post)
@@ -915,6 +922,12 @@ describe Category do
         expect(parent_category.errors.full_messages).to contain_exactly(I18n.t("category.errors.permission_conflict", group_names: group2.name))
       end
 
+      it "is not valid if the subcategory has no category groups, but the parent does" do
+        parent_category.set_permissions(group => :readonly)
+
+        expect(parent_category).not_to be_valid
+      end
+
       it "is valid if subcategory permissions are same or more restrictive" do
         subcategory.set_permissions(group => :create_post)
         subcategory.save!

From c3cc96084cba4395a5eb226a9193a12cfdfe4726 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 15 Oct 2019 18:16:55 +1100
Subject: [PATCH 037/328] FIX: remove hiredis gem which is no longer needed

Previously some local micro-benchmarks revealed it was not giving any perf
benefits.

Now that we upgraded to 2.6.5 we are seeing some segfaults.

No need to carry this dependency around anymore.

We can re-evaluate in future if it improves perf and fix the segfaults.
---
 Gemfile      | 4 +---
 Gemfile.lock | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1319c51438..24f193b165 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,8 +36,6 @@ gem 'mail', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
-gem 'hiredis'
-
 # holding off redis upgrade temporarily as it is having issues with our current
 # freedom patch, we will follow this up.
 #
@@ -45,7 +43,7 @@ gem 'hiredis'
 # /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `delete'
 # /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `initialize'
 # /var/www/discourse/lib/freedom_patches/redis.rb:7:in `initialize'
-gem 'redis', '4.0.1', require:  ["redis", "redis/connection/hiredis"]
+gem 'redis', '4.0.1'
 gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 68169948e9..b7f497896e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,6 @@ GEM
     hashdiff (0.3.9)
     hashie (3.6.0)
     highline (1.7.10)
-    hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
@@ -467,7 +466,6 @@ DEPENDENCIES
   flamegraph
   gc_tracer
   highline (~> 1.7.0)
-  hiredis
   htmlentities
   http_accept_language (~> 2.0.5)
   listen

From b2f682f35eba0cc3f09588356ecf8d1dd824542f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 15 Oct 2019 18:41:27 +0530
Subject: [PATCH 038/328] FEATURE: Option to update category preferences of all
 users when site setting changed (#8180)

---
 .../admin/components/site-setting.js.es6      | 48 ++++++++++++++++++-
 .../site-setting-default-categories.js.es6    | 19 ++++++++
 .../admin/mixins/setting-component.js.es6     | 32 +++++++------
 .../admin/models/site-setting.js.es6          |  7 ++-
 .../modal/site-setting-default-categories.hbs |  8 ++++
 .../admin/site_settings_controller.rb         | 35 ++++++++++++++
 config/locales/client.en.yml                  |  4 ++
 .../admin/site_settings_controller_spec.rb    | 38 +++++++++++++++
 8 files changed, 173 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6
 create mode 100644 app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 78696c6e06..4c1d76cad8 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -1,10 +1,54 @@
 import BufferedContent from "discourse/mixins/buffered-content";
 import SiteSetting from "admin/models/site-setting";
 import SettingComponent from "admin/mixins/setting-component";
+import showModal from "discourse/lib/show-modal";
+import AboutRoute from "discourse/routes/about";
 
 export default Ember.Component.extend(BufferedContent, SettingComponent, {
-  _save() {
+  update(key, value, updateExistingUsers = false) {
+    if (updateExistingUsers) {
+      return SiteSetting.update(key, value, { updateExistingUsers: true });
+    } else {
+      return SiteSetting.update(key, value);
+    }
+  },
+
+  _save(callback) {
+    const defaultCategoriesSettings = [
+      "default_categories_watching",
+      "default_categories_tracking",
+      "default_categories_muted",
+      "default_categories_watching_first_post"
+    ];
     const setting = this.buffered;
-    return SiteSetting.update(setting.get("setting"), setting.get("value"));
+    const key = setting.get("setting");
+    const value = setting.get("value");
+
+    if (defaultCategoriesSettings.includes(key)) {
+      AboutRoute.create()
+        .model()
+        .then(result => {
+          const controller = showModal("site-setting-default-categories", {
+            model: {
+              count: result.stats.user_count,
+              key: key.replace(/_/g, " ")
+            },
+            admin: true
+          });
+
+          controller.setProperties({
+            onClose: () => {
+              const updateExistingUsers = controller.get("updateExistingUsers");
+              if (updateExistingUsers === true) {
+                callback(this.update(key, value, true));
+              } else if (updateExistingUsers === false) {
+                callback(this.update(key, value));
+              }
+            }
+          });
+        });
+    } else {
+      callback(this.update(key, value));
+    }
   }
 });
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.es6
new file mode 100644
index 0000000000..5b856f1dbc
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6
@@ -0,0 +1,19 @@
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  onShow() {
+    this.set("updateExistingUsers", null);
+  },
+
+  actions: {
+    updateExistingUsers() {
+      this.set("updateExistingUsers", true);
+      this.send("closeModal");
+    },
+
+    cancel() {
+      this.set("updateExistingUsers", false);
+      this.send("closeModal");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 18be48a2d1..a2d5b3a4de 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -111,21 +111,23 @@ export default Ember.Mixin.create({
 
   actions: {
     save() {
-      this._save()
-        .then(() => {
-          this.set("validationMessage", null);
-          this.commitBuffer();
-          if (AUTO_REFRESH_ON_SAVE.includes(this.get("setting.setting"))) {
-            this.afterSave();
-          }
-        })
-        .catch(e => {
-          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-            this.set("validationMessage", e.jqXHR.responseJSON.errors[0]);
-          } else {
-            this.set("validationMessage", I18n.t("generic_error"));
-          }
-        });
+      this._save(result => {
+        result
+          .then(() => {
+            this.set("validationMessage", null);
+            this.commitBuffer();
+            if (AUTO_REFRESH_ON_SAVE.includes(this.get("setting.setting"))) {
+              this.afterSave();
+            }
+          })
+          .catch(e => {
+            if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+              this.set("validationMessage", e.jqXHR.responseJSON.errors[0]);
+            } else {
+              this.set("validationMessage", I18n.t("generic_error"));
+            }
+          });
+      });
     },
 
     cancel() {
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js.es6
index ca1c175864..7760a61114 100644
--- a/app/assets/javascripts/admin/models/site-setting.js.es6
+++ b/app/assets/javascripts/admin/models/site-setting.js.es6
@@ -25,9 +25,14 @@ SiteSetting.reopenClass({
     });
   },
 
-  update(key, value) {
+  update(key, value, opts = {}) {
     const data = {};
     data[key] = value;
+
+    if (opts["updateExistingUsers"] === true) {
+      data["updateExistingUsers"] = true;
+    }
+
     return ajax(`/admin/site_settings/${key}`, { type: "PUT", data });
   }
 });
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
new file mode 100644
index 0000000000..e56bf01c65
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
@@ -0,0 +1,8 @@
+{{#d-modal-body class="incoming-emails" rawTitle=model.key}}
+{{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button action=(action "updateExistingUsers") class='btn btn-primary' label='admin.site_settings.default_categories.modal_yes'}}
+  {{d-button action=(action "cancel") class='btn' label='admin.site_settings.default_categories.modal_no'}}
+</div>
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 546d7974f1..7a066924c3 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -20,7 +20,42 @@ class Admin::SiteSettingsController < Admin::AdminController
       value = Upload.find_by(url: value) || ''
     end
 
+    update_existing_users = params[:updateExistingUsers].present?
+    previous_category_ids = (SiteSetting.send(id) || "").split("|") if update_existing_users
+
     SiteSetting.set_and_log(id, value, current_user)
+
+    if update_existing_users
+      new_category_ids = (value || "").split("|")
+
+      case id
+      when "default_categories_watching"
+        notification_level = NotificationLevels.all[:watching]
+      when "default_categories_tracking"
+        notification_level = NotificationLevels.all[:tracking]
+      when "default_categories_muted"
+        notification_level = NotificationLevels.all[:muted]
+      when "default_categories_watching_first_post"
+        notification_level = NotificationLevels.all[:watching_first_post]
+      end
+
+      (previous_category_ids - new_category_ids).each do |category_id|
+        CategoryUser.where(category_id: category_id, notification_level: notification_level).delete_all
+      end
+
+      (new_category_ids - previous_category_ids).each do |category_id|
+        skip_user_ids = CategoryUser.where(category_id: category_id).pluck(:user_id)
+
+        User.where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
+          category_users = []
+          users.each { |user| category_users << { category_id: category_id, user_id: user.id, notification_level: notification_level } }
+          CategoryUser.insert_all!(category_users)
+        end
+
+        CategoryUser.where(category_id: category_id, notification_level: notification_level).first_or_create!(notification_level: notification_level)
+      end
+    end
+
     render body: nil
   end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index df10b60207..c12494cc5b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4304,6 +4304,10 @@ en:
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Input fields cannot be empty or contain vertical bar character."
+        default_categories:
+          modal_description: "Would you like to apply this change historically? This will change preferences for %{count} existing users."
+          modal_yes: "Yes"
+          modal_no: "No, only apply change going forward"
 
       badges:
         title: Badges
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index e134ba0669..3d3d70ca56 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -53,6 +53,44 @@ describe Admin::SiteSettingsController do
         expect(SiteSetting.test_setting).to eq('')
       end
 
+      describe 'default categories' do
+        let(:user1) { Fabricate(:user) }
+        let(:user2) { Fabricate(:user) }
+        let(:watching) { NotificationLevels.all[:watching] }
+        let(:tracking) { NotificationLevels.all[:tracking] }
+
+        let(:category_ids) { 3.times.collect { Fabricate(:category).id } }
+
+        before do
+          SiteSetting.setting(:default_categories_watching, category_ids.first(2).join("|"))
+          CategoryUser.create!(category_id: category_ids.last, notification_level: tracking, user: user2)
+        end
+
+        after do
+          SiteSetting.setting(:default_categories_watching, "")
+        end
+
+        it 'should update existing users user preference' do
+          put "/admin/site_settings/default_categories_watching.json", params: {
+            default_categories_watching: category_ids.last(2).join("|"),
+            updateExistingUsers: true
+          }
+
+          expect(CategoryUser.where(category_id: category_ids.first, notification_level: watching).count).to eq(0)
+          expect(CategoryUser.where(category_id: category_ids.last, notification_level: watching).count).to eq(User.count - 1)
+        end
+
+        it 'should not update existing users user preference' do
+          expect {
+            put "/admin/site_settings/default_categories_watching.json", params: {
+              default_categories_watching: category_ids.last(2).join("|")
+            }
+          }.to change { CategoryUser.where(category_id: category_ids.first, notification_level: watching).count }.by(0)
+
+          expect(CategoryUser.where(category_id: category_ids.last, notification_level: watching).count).to eq(0)
+        end
+      end
+
       describe 'upload site settings' do
         it 'can remove the site setting' do
           SiteSetting.test_upload = Fabricate(:upload)

From e83c2488a2d9c686fde83cef93878ee4a9d0f119 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 15 Oct 2019 10:51:53 -0400
Subject: [PATCH 039/328] FIX: do not unpin reply box in iOS when selecting
 Emoji

---
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 1fb5318045..b8a4b8c02b 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -117,6 +117,7 @@ function positioningWorkaround($fixedElement) {
     if (
       lastTouchedElement &&
       ($(lastTouchedElement).hasClass("select-kit-header") ||
+        $(lastTouchedElement).closest(".autocomplete") ||
         ["span", "svg", "button"].includes(
           lastTouchedElement.nodeName.toLowerCase()
         ))

From 5f5b232cdec46b43e44a27f88097636679fe212d Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 15 Oct 2019 16:39:09 +0100
Subject: [PATCH 040/328] FIX: Category.find_by_slug

find_by_slug should ensure that the parent actually exists when its
looking for a parent.
---
 app/controllers/categories_controller.rb |  3 +++
 app/models/category.rb                   |  3 ++-
 spec/models/category_spec.rb             | 32 +++++++++++++++++++++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 6f60b09cff..a548e6c815 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -206,6 +206,9 @@ class CategoriesController < ApplicationController
   def find_by_slug
     params.require(:category_slug)
     @category = Category.find_by_slug(params[:category_slug], params[:parent_category_slug])
+
+    raise Discourse::NotFound unless @category.present?
+
     if !guardian.can_see?(@category)
       if SiteSetting.detailed_404 && group = @category.access_category_via_group
         raise Discourse::InvalidAccess.new(
diff --git a/app/models/category.rb b/app/models/category.rb
index c0f66dbea9..a903c8f366 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -709,7 +709,8 @@ class Category < ActiveRecord::Base
 
   def self.find_by_slug(category_slug, parent_category_slug = nil)
     if parent_category_slug
-      parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).pluck(:id).first
+      parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).select(:id)
+
       self.where(slug: category_slug, parent_category_id: parent_category_id).first
     else
       self.where(slug: category_slug, parent_category_id: nil).first
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 35a58303df..225b87eeab 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -742,12 +742,36 @@ describe Category do
   end
 
   describe "find_by_slug" do
-    it "finds with category and sub category" do
-      category = Fabricate(:category_with_definition, slug: 'awesome-category')
-      sub_category = Fabricate(:category_with_definition, parent_category_id: category.id, slug: 'awesome-sub-category')
+    fab!(:category) do
+      Fabricate(:category_with_definition, slug: 'awesome-category')
+    end
 
+    fab!(:subcategory) do
+      Fabricate(
+        :category_with_definition,
+        parent_category_id: category.id,
+        slug: 'awesome-sub-category'
+      )
+    end
+
+    it "finds a category that exists" do
       expect(Category.find_by_slug('awesome-category')).to eq(category)
-      expect(Category.find_by_slug('awesome-sub-category', 'awesome-category')).to eq(sub_category)
+    end
+
+    it "finds a subcategory that exists" do
+      expect(Category.find_by_slug('awesome-sub-category', 'awesome-category')).to eq(subcategory)
+    end
+
+    it "produces nil if the parent doesn't exist" do
+      expect(Category.find_by_slug('awesome-sub-category', 'no-such-category')).to eq(nil)
+    end
+
+    it "produces nil if the parent doesn't exist and the requested category is a root category" do
+      expect(Category.find_by_slug('awesome-category', 'no-such-category')).to eq(nil)
+    end
+
+    it "produces nil if the subcategory doesn't exist" do
+      expect(Category.find_by_slug('no-such-category', 'awesome-category')).to eq(nil)
     end
   end
 

From c71da3f3352159f02276c9a49f1ed8c54c75010d Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 8 Oct 2019 14:00:05 +0100
Subject: [PATCH 041/328] FIX: Add unique index to prevent duplicate slugs for
 categories

---
 app/models/category.rb                               |  1 +
 ...1008124357_add_unique_index_categories_on_slug.rb | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 db/migrate/20191008124357_add_unique_index_categories_on_slug.rb

diff --git a/app/models/category.rb b/app/models/category.rb
index a903c8f366..db500e6ff6 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -890,4 +890,5 @@ end
 #  index_categories_on_search_priority         (search_priority)
 #  index_categories_on_topic_count             (topic_count)
 #  unique_index_categories_on_name             (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE
+#  unique_index_categories_on_slug             (COALESCE(parent_category_id, '-1'::integer), slug) UNIQUE
 #
diff --git a/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb b/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb
new file mode 100644
index 0000000000..5ee97c6482
--- /dev/null
+++ b/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexCategoriesOnSlug < ActiveRecord::Migration[6.0]
+  def change
+    add_index(
+      :categories,
+      'COALESCE(parent_category_id, -1), slug',
+      name: 'unique_index_categories_on_slug',
+      unique: true
+    )
+  end
+end

From 50b618dd443691137684ce60837cd8b306889732 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 15 Oct 2019 16:21:55 -0400
Subject: [PATCH 042/328] UX: Add CSS classes to digest email template to allow
 for easier styling

---
 app/views/user_notifications/digest.html.erb | 76 ++++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index f24dd64688..fd188c9f6c 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -5,7 +5,7 @@
 </span>
 
 <%- if I18n.t('user_notifications.digest.custom.html.header').present? %>
-  <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;border-spacing:0;padding:0;">
+  <table class="digest-header logo-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;border-spacing:0;padding:0;">
     <tr>
       <td style="padding:0;">
         <%= raw(t 'user_notifications.digest.custom.html.header') %>
@@ -13,7 +13,7 @@
     </tr>
   </table>
 <%- else %>
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#<%= @header_bgcolor -%>;width:100%;">
+<table class="digest-header text-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#<%= @header_bgcolor -%>;width:100%;">
   <tr>
     <td align="center" style="text-align: center;padding: 20px 0; font-family:Helvetica,Arial,sans-serif;">
 
@@ -30,7 +30,7 @@
 </table>
 <%- end %>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
+<table class="digest-content" dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <div class="with-accent-colors">
@@ -44,26 +44,26 @@
       </div>
     </td>
     <td style="vertical-align:top;padding:0;font-family:Helvetica,Arial,sans-serif;">
-      <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" class="with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
+      <table class="digest-content-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" class="with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
         <tbody>
           <tr>
             <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
 
 <br/>
-<center class="with-accent-colors" style="font-size:22px;font-weight:400;"><%=t 'user_notifications.digest.since_last_visit' %></center>
+<center class="header-since-last-visit with-accent-colors" style="font-size:22px;font-weight:400;"><%=t 'user_notifications.digest.since_last_visit' %></center>
 
 
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%">
+<table class="header-stats" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%">
 <tbody>
-  <tr>
+  <tr class="header-stat-count">
     <%- @counts.each do |count| -%>
       <td style="text-align:center;font-size:36px;font-weight:400;">
         <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%= count[:value] -%></strong></a>
       </td>
     <%- end -%>
   </tr>
-  <tr>
+  <tr class="header-stat-description">
     <%- @counts.each do |count| -%>
       <td style="font-size:14px;font-weight:400;text-align:center;">
         <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%=t count[:label_key] -%></strong></a>
@@ -73,7 +73,7 @@
 </tbody>
 </table>
 
-<center class="with-accent-colors" style="font-size:22px;font-weight:400;margin-bottom: 8px;"><%=t 'user_notifications.digest.popular_topics' %></center>
+<center class="header-popular-topics with-accent-colors" style="font-size:22px;font-weight:400;margin-bottom: 8px;"><%=t 'user_notifications.digest.popular_topics' %></center>
 
 
             </td>
@@ -83,20 +83,20 @@
       <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
         <tbody>
           <tr>
-            <td style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
+            <td class="digest-popular-topic-wrapper" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
 
 <% @popular_topics.each_with_index do |t, i| %>
 <!--   Beginning of Popular Topic   -->
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%">
+<table class="digest-topic popular-topic" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%">
   <tbody>
     <tr>
-      <td style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+      <td class="digest-topic-category" style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
         <p style="color:#8f8f8f;line-height:1.3;margin: 20px 0 0 0;">
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </p>
       </td>
       <td style="margin:0;padding:<%= rtl? ? '0 0 0 16px' : '0 16px 0 0' %>;text-align:<%= rtl? ? 'left' : 'right' %>;vertical-align:top;">
-        <p class="text-right" style="color:#8f8f8f;line-height:1.3;margin:20px 0 0 0;font-weight:400;">
+        <p class="text-right digest-created-at" style="color:#8f8f8f;line-height:1.3;margin:20px 0 0 0;font-weight:400;">
           <%= short_date(t.created_at) %>
         </p>
       </td>
@@ -108,7 +108,7 @@
   <tbody>
     <tr>
       <td style="padding:<%= rtl? ? '0 16px 8px 8px' : '0 8px 8px 16px' %>; text-align:<%= rtl? ? 'right' : 'left' %>; width:100%;">
-        <h2 style="font-size:18px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal">
+        <h2 class="digest-topic-title" style="font-size:18px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal">
           <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
             <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
           </a>
@@ -124,15 +124,15 @@
 <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;">
+      <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;">
         <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center">
       </td>
       <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
         <% if t.user %>
           <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %>
-            <h6 style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
+            <h6 class="digest-topic-username" style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
           <% end %>
-          <p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p>
+          <p class="digest-topic-name" style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p>
         <% end %>
       </td>
       <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
@@ -145,7 +145,7 @@
 </table>
 
 <%- if t.first_post.present? && !t.first_post.user_deleted %>
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-bottom:1px solid #f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="digest-topic-body" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-bottom:1px solid #f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
       <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%;font-weight:normal;">
@@ -156,26 +156,26 @@
 </table>
 <%- end %>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%; margin-top:20px;">
+<table class="digest-topic-stats" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%; margin-top:20px;">
   <tbody>
     <tr>
-      <td style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
-        <img src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+      <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
+        <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.like_count -%></p>
       </td>
-      <td style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
-        <img src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+      <td class="digest-topic-stat" style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
+        <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
-      <td style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;">
+      <td class="digest-topic-posters" style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;">
         <% t.posters_summary.each do |ps| %>
           <% if ps.user %>
             <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;">
           <% end %>
         <% end %>
       </td>
-      <td style="line-height:1.3;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;white-space:nowrap;vertical-align:top;">
-        <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
+      <td class="digest-read-more-wrap" style="line-height:1.3;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;white-space:nowrap;vertical-align:top;">
+        <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
           <%=t 'user_notifications.digest.join_the_discussion' %>
         </a>
       </td>
@@ -267,7 +267,7 @@
         <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'left' : 'right' %>;">
           <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%></a>
         </p>
-        <a href="<%= post.full_url -%>" class="with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space: nowrap;">
+        <a href="<%= post.full_url -%>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space: nowrap;">
           <%=t 'user_notifications.digest.join_the_discussion' %>
         </a>
       </td>
@@ -295,49 +295,49 @@
 <%= digest_custom_html("above_popular_topics") %>
 
 <% if @other_new_for_you.present? %>
-  <center style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Helvetica,Arial,sans-serif;"><%=t 'user_notifications.digest.more_new' %></center>
+  <center class="digest-new-header" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Helvetica,Arial,sans-serif;"><%=t 'user_notifications.digest.more_new' %></center>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="digest-new-topics body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
     <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;margin:0;padding:0;">
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="digest-new-topic" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
 
 <% @other_new_for_you.each do |t| %>
 
 <!--   Begin new topic  -->
     <tr style="vertical-align:top;">
-      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+      <td class="digest-new-topic-title" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
         <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
           <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
         </a>
         <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
           <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
         <%- end %>
-        <p style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>">
+        <p class="digest-new-topic-category" style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>">
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </p>
       </td>
-      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+      <td class="digest-new-topic-posters" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
         <% t.posters_summary[0,2].each do |ps| %>
           <% if ps.user %>
             <img src="<%= ps.user.small_avatar_url -%>" style="height:20px;width:20px;margin:<%= rtl? ? '0 0 5px 5px' : '0 5px 5px 0' %>;border-radius:50%;clear:both;display:inline-block;outline:0;text-decoration:none;">
           <% end %>
         <% end %>
       </td>
-      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
-        <img src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+      <td class="digest-new-topic-stat" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+        <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.like_count -%></p>
       </td>
-      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
-        <img src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+      <td class="digest-new-topic-stat digest-replies" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+        <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
     </tr>
 
-    <tr><td colspan="6" height="10px" style="border-collapse:collapse!important;line-height:10px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr>
+    <tr class="digest-new-topic-spacer"><td colspan="6" height="10px" style="border-collapse:collapse!important;line-height:10px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr>
 
 <!--   End new topic  -->
 

From 943d8e0a97ba5b39a9143ac50358ef7c0a7bad43 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 15 Oct 2019 22:37:15 +0100
Subject: [PATCH 043/328] DEV: Update JS test fixtures

- `site.json` now returns a list of group objects, not a `group_names` array (a6714e25)
- `c/1/show.json` now includes `custom_fields: {}`, even if no fields exist (b8bd0316)
---
 .../fixtures/category-fixtures.js.es6         |  3 ++-
 .../javascripts/fixtures/site-fixtures.js.es6 | 27 +++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js.es6
index f77273da73..c8625b03f4 100644
--- a/test/javascripts/fixtures/category-fixtures.js.es6
+++ b/test/javascripts/fixtures/category-fixtures.js.es6
@@ -35,7 +35,8 @@ export default {
       position: 25,
       cannot_delete_reason:
         "Can't delete this category because it has 2030 topics. Oldest topic is <a href=\"https://localhost:3000/t/when-a-new-post-appears-in-a-topic-the-bookmark-isn-t-updated/39\">When a new post appears in a topic, the bookmark isn't updated</a>.",
-      allow_badges: true
+      allow_badges: true,
+      custom_fields: {}
     }
   }
 };
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js.es6
index 72712c317c..fc8934c1aa 100644
--- a/test/javascripts/fixtures/site-fixtures.js.es6
+++ b/test/javascripts/fixtures/site-fixtures.js.es6
@@ -13,23 +13,16 @@ export default {
         small_action: 3,
         whisper: 4
       },
-      group_names: [
-        "admins",
-        "discourse",
-        "everyone",
-        "mcneel",
-        "moderators",
-        "newrelic",
-        "plugin_authors",
-        "sitepoint",
-        "staff",
-        "translators",
-        "trust_level_0",
-        "trust_level_1",
-        "trust_level_2",
-        "trust_level_3",
-        "trust_level_4",
-        "ubuntu"
+      groups: [
+        { id: 1, name: "admins" },
+        { id: 2, name: "moderators" },
+        { id: 3, name: "staff" },
+        { id: 4, name: "custom_group" },
+        { id: 10, name: "trust_level_0" },
+        { id: 11, name: "trust_level_1" },
+        { id: 12, name: "trust_level_2" },
+        { id: 13, name: "trust_level_3" },
+        { id: 14, name: "trust_level_4" }
       ],
       filters: [
         "latest",

From 7332649f1a26ec07d82d42d4c8e1139dff68dc51 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 15 Oct 2019 22:37:41 +0100
Subject: [PATCH 044/328] DEV: Add plugin outlet to category security tab

---
 .../discourse/templates/components/edit-category-security.hbs   | 2 ++
 1 file changed, 2 insertions(+)

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 c7e15559f8..94b2440b8e 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -51,3 +51,5 @@
     {{/unless}}
   {{/if}}
 </section>
+
+{{plugin-outlet name="category-custom-security" args=(hash category=category) connectorTagName="" tagName="section"}}

From ac2cd07775162b0e7a856cfc4b239c7ff5c5ccca Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 15 Oct 2019 22:49:46 +0100
Subject: [PATCH 045/328] DEV: Add discourse-restricted-replies as official
 plugin

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

diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 09bf604c90..d2097756df 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -68,6 +68,7 @@ class Plugin::Metadata
     "discourse-voting",
     "discourse-yearly-review",
     "discourse-openid-connect",
+    "discourse-restricted-replies",
     "docker_manager",
     "lazy-yt",
     "poll"

From 5a8fdd02fe209872b2e2452b9b83e227dfed1727 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 16 Oct 2019 09:18:48 +1100
Subject: [PATCH 046/328] FIX: public_file_server.enabled is false in test
 (#8192)

After a small conversation, we decided that we can set `public_file_server.enabled` to false in the `test` environment to have the same value as `production`.
---
 config/environments/test.rb              | 2 +-
 spec/requests/uploads_controller_spec.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index da7b6f2ef3..4ff6594e90 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -10,7 +10,7 @@ Discourse::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.public_file_server.enabled = true
+  config.public_file_server.enabled = false
 
   # don't consider reqs local so we can properly handle exceptions like we do in prd
   config.consider_all_requests_local       = false
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index cb738c73ea..0d3231568c 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -266,7 +266,6 @@ describe UploadsController do
     end
 
     it 'returns 200 when js file' do
-      ActionDispatch::FileHandler.any_instance.stubs(:match?).returns(false)
       upload = upload_file("test.js", "themes")
       get upload.url
       expect(response.status).to eq(200)

From 061c8874f527a391524a4d736f3c3da93e3124a1 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 15 Oct 2019 23:52:52 +0100
Subject: [PATCH 047/328] FIX: Correct line count link in GitHub commit onebox

Bump onebox version
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 24f193b165..d523170a4e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.9.18'
+gem 'onebox', '1.9.19'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b7f497896e..d54d718a12 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.18)
+    onebox (1.9.19)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -499,7 +499,7 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.9.18)
+  onebox (= 1.9.19)
   openid-redis-store
   parallel_tests
   pg

From 0bf55fe2ff136d42190e541a48248552dcbb6167 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 16 Oct 2019 10:39:31 +1100
Subject: [PATCH 048/328] Revert "FIX: public_file_server.enabled is false in
 test (#8192)" (#8196)

This reverts commit 5a8fdd02fe209872b2e2452b9b83e227dfed1727.
---
 config/environments/test.rb              | 2 +-
 spec/requests/uploads_controller_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4ff6594e90..da7b6f2ef3 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -10,7 +10,7 @@ Discourse::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.public_file_server.enabled = false
+  config.public_file_server.enabled = true
 
   # don't consider reqs local so we can properly handle exceptions like we do in prd
   config.consider_all_requests_local       = false
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 0d3231568c..cb738c73ea 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -266,6 +266,7 @@ describe UploadsController do
     end
 
     it 'returns 200 when js file' do
+      ActionDispatch::FileHandler.any_instance.stubs(:match?).returns(false)
       upload = upload_file("test.js", "themes")
       get upload.url
       expect(response.status).to eq(200)

From 645faa847b460e5341857ea1b0d40706227dd5a7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 15 Oct 2019 20:12:50 -0400
Subject: [PATCH 049/328] Follow up fix to c71da3f, class was defined twice

---
 app/views/user_notifications/digest.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index fd188c9f6c..2559e26595 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -44,7 +44,7 @@
       </div>
     </td>
     <td style="vertical-align:top;padding:0;font-family:Helvetica,Arial,sans-serif;">
-      <table class="digest-content-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" class="with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
+      <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" class="digest-content-header with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
         <tbody>
           <tr>
             <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">

From d5d8db7fa82d314adcd064882a57a48b3eb088e2 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 16 Oct 2019 16:53:31 +1100
Subject: [PATCH 050/328] FEATURE: improve honeypot and challenge logic

This feature amends it so instead of using one challenge and honeypot
statically per site we have a rotating honeypot and challenge value which
changes every hour.

This means you must grab a fresh copy of honeypot and challenge value once
an hour or account registration will be rejected.

We also now cycle the value of the challenge when after successful account
registration forcing an extra call to hp.json between account registrations

Client has been made aware of these changes.

Additionally this contains a JavaScript workaround for:
https://bugs.chromium.org/p/chromium/issues/detail?id=987293

This is client side code that is specific to Chrome user agent and swaps
a PASSWORD type honeypot with a TEXT type honeypot.
---
 .../controllers/create-account.js.es6         | 190 +++++++++++-------
 .../templates/modal/create-account.hbs        |   2 +-
 app/controllers/users_controller.rb           |  30 ++-
 lib/secure_session.rb                         |  27 ++-
 spec/requests/users_controller_spec.rb        |  47 ++++-
 5 files changed, 198 insertions(+), 98 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 1c8ecb254a..0db34a4e94 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -24,7 +24,6 @@ export default Ember.Controller.extend(
     login: Ember.inject.controller(),
 
     complete: false,
-    accountPasswordConfirm: 0,
     accountChallenge: 0,
     formSubmitted: false,
     rejectedEmails: Ember.A([]),
@@ -191,8 +190,36 @@ export default Ember.Controller.extend(
     @on("init")
     fetchConfirmationValue() {
       return ajax(userPath("hp.json")).then(json => {
+        this._challengeDate = new Date();
+        // remove 30 seconds for jitter, make sure this works for at least
+        // 30 seconds so we don't have hard loops
+        this._challengeExpiry = parseInt(json.expires_in, 10) - 30;
+        if (this._challengeExpiry < 30) {
+          this._challengeExpiry = 30;
+        }
+
+        const confirmation = document.getElementById(
+          "new-account-confirmation"
+        );
+        if (confirmation) {
+          confirmation.value = json.value;
+        }
+
+        // Chrome autocomplete is buggy per:
+        // https://bugs.chromium.org/p/chromium/issues/detail?id=987293
+        // work around issue while leaving a semi useable honeypot for
+        // bots that are running full Chrome
+        if (confirmation && navigator.userAgent.indexOf("Chrome") > 0) {
+          const newConfirmation = document.createElement("input");
+
+          newConfirmation.type = "text";
+          newConfirmation.id = "new-account-confirmation";
+          newConfirmation.value = json.value;
+
+          confirmation.parentNode.replaceChild(newConfirmation, confirmation);
+        }
+
         this.setProperties({
-          accountPasswordConfirm: json.value,
           accountChallenge: json.challenge
             .split("")
             .reverse()
@@ -201,85 +228,102 @@ export default Ember.Controller.extend(
       });
     },
 
+    performAccountCreation() {
+      const attrs = this.getProperties(
+        "accountName",
+        "accountEmail",
+        "accountPassword",
+        "accountUsername",
+        "accountChallenge"
+      );
+
+      attrs["accountPasswordConfirm"] = document.getElementById(
+        "new-account-confirmation"
+      ).value;
+
+      const userFields = this.userFields;
+      const destinationUrl = this.get("authOptions.destination_url");
+
+      if (!Ember.isEmpty(destinationUrl)) {
+        $.cookie("destination_url", destinationUrl, { path: "/" });
+      }
+
+      // Add the userfields to the data
+      if (!Ember.isEmpty(userFields)) {
+        attrs.userFields = {};
+        userFields.forEach(
+          f => (attrs.userFields[f.get("field.id")] = f.get("value"))
+        );
+      }
+
+      this.set("formSubmitted", true);
+      return Discourse.User.createAccount(attrs).then(
+        result => {
+          this.set("isDeveloper", false);
+          if (result.success) {
+            // invalidate honeypot
+            this._challengeExpiry = 1;
+
+            // Trigger the browser's password manager using the hidden static login form:
+            const $hidden_login_form = $("#hidden-login-form");
+            $hidden_login_form
+              .find("input[name=username]")
+              .val(attrs.accountUsername);
+            $hidden_login_form
+              .find("input[name=password]")
+              .val(attrs.accountPassword);
+            $hidden_login_form
+              .find("input[name=redirect]")
+              .val(userPath("account-created"));
+            $hidden_login_form.submit();
+          } else {
+            this.flash(
+              result.message || I18n.t("create_account.failed"),
+              "error"
+            );
+            if (result.is_developer) {
+              this.set("isDeveloper", true);
+            }
+            if (
+              result.errors &&
+              result.errors.email &&
+              result.errors.email.length > 0 &&
+              result.values
+            ) {
+              this.rejectedEmails.pushObject(result.values.email);
+            }
+            if (
+              result.errors &&
+              result.errors.password &&
+              result.errors.password.length > 0
+            ) {
+              this.rejectedPasswords.pushObject(attrs.accountPassword);
+            }
+            this.set("formSubmitted", false);
+            $.removeCookie("destination_url");
+          }
+        },
+        () => {
+          this.set("formSubmitted", false);
+          $.removeCookie("destination_url");
+          return this.flash(I18n.t("create_account.failed"), "error");
+        }
+      );
+    },
+
     actions: {
       externalLogin(provider) {
         this.login.send("externalLogin", provider);
       },
 
       createAccount() {
-        const attrs = this.getProperties(
-          "accountName",
-          "accountEmail",
-          "accountPassword",
-          "accountUsername",
-          "accountPasswordConfirm",
-          "accountChallenge"
-        );
-        const userFields = this.userFields;
-        const destinationUrl = this.get("authOptions.destination_url");
-
-        if (!Ember.isEmpty(destinationUrl)) {
-          $.cookie("destination_url", destinationUrl, { path: "/" });
-        }
-
-        // Add the userfields to the data
-        if (!Ember.isEmpty(userFields)) {
-          attrs.userFields = {};
-          userFields.forEach(
-            f => (attrs.userFields[f.get("field.id")] = f.get("value"))
+        if (new Date() - this._challengeDate > 1000 * this._challengeExpiry) {
+          this.fetchConfirmationValue().then(() =>
+            this.performAccountCreation()
           );
+        } else {
+          this.performAccountCreation();
         }
-
-        this.set("formSubmitted", true);
-        return Discourse.User.createAccount(attrs).then(
-          result => {
-            this.set("isDeveloper", false);
-            if (result.success) {
-              // Trigger the browser's password manager using the hidden static login form:
-              const $hidden_login_form = $("#hidden-login-form");
-              $hidden_login_form
-                .find("input[name=username]")
-                .val(attrs.accountUsername);
-              $hidden_login_form
-                .find("input[name=password]")
-                .val(attrs.accountPassword);
-              $hidden_login_form
-                .find("input[name=redirect]")
-                .val(userPath("account-created"));
-              $hidden_login_form.submit();
-            } else {
-              this.flash(
-                result.message || I18n.t("create_account.failed"),
-                "error"
-              );
-              if (result.is_developer) {
-                this.set("isDeveloper", true);
-              }
-              if (
-                result.errors &&
-                result.errors.email &&
-                result.errors.email.length > 0 &&
-                result.values
-              ) {
-                this.rejectedEmails.pushObject(result.values.email);
-              }
-              if (
-                result.errors &&
-                result.errors.password &&
-                result.errors.password.length > 0
-              ) {
-                this.rejectedPasswords.pushObject(attrs.accountPassword);
-              }
-              this.set("formSubmitted", false);
-              $.removeCookie("destination_url");
-            }
-          },
-          () => {
-            this.set("formSubmitted", false);
-            $.removeCookie("destination_url");
-            return this.flash(I18n.t("create_account.failed"), "error");
-          }
-        );
       }
     }
   }
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 4615fb74bf..ad5dacdfc8 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -83,7 +83,7 @@
           <tr class="password-confirmation">
             <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
             <td>
-              {{input type="password" value=accountPasswordConfirm id="new-account-confirmation" autocomplete="new-password"}}
+              <input autocomplete="new-password" id="new-account-confirmation" type="password">
               {{input value=accountChallenge id="new-account-challenge"}}
             </td>
           </tr>
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5ffc97b712..a696aa4ab1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -414,6 +414,9 @@ class UsersController < ApplicationController
       authentication.finish
       activation.finish
 
+      secure_session[HONEYPOT_KEY] = nil
+      secure_session[CHALLENGE_KEY] = nil
+
       # save user email in session, to show on account-created page
       session["user_created_message"] = activation.message
       session[SessionController::ACTIVATE_USER_KEY] = user.id
@@ -467,7 +470,14 @@ class UsersController < ApplicationController
   end
 
   def get_honeypot_value
-    render json: { value: honeypot_value, challenge: challenge_value }
+    secure_session.set(HONEYPOT_KEY, honeypot_value, expires: 1.hour)
+    secure_session.set(CHALLENGE_KEY, challenge_value, expires: 1.hour)
+
+    render json: {
+      value: honeypot_value,
+      challenge: challenge_value,
+      expires_in: SecureSession.expiry
+    }
   end
 
   def password_reset
@@ -660,7 +670,6 @@ class UsersController < ApplicationController
         security_keys_enabled = email_token_user&.security_keys_enabled?
         second_factor_token = params[:second_factor_token]
         second_factor_method = params[:second_factor_method].to_i
-        security_key_credential = params[:security_key_credential]
         confirm_email = false
         @security_key_required = security_keys_enabled
 
@@ -1368,22 +1377,21 @@ class UsersController < ApplicationController
     render json: success_json
   end
 
-  private
+  HONEYPOT_KEY ||= 'HONEYPOT_KEY'
+  CHALLENGE_KEY ||= 'CHALLENGE_KEY'
+
+  protected
 
   def honeypot_value
-    Digest::SHA1::hexdigest("#{Discourse.current_hostname}:#{GlobalSetting.safe_secret_key_base}")[0, 15]
+    secure_session[HONEYPOT_KEY] ||= SecureRandom.hex
   end
 
   def challenge_value
-    challenge = $redis.get('SECRET_CHALLENGE')
-    unless challenge && challenge.length == 16 * 2
-      challenge = SecureRandom.hex(16)
-      $redis.set('SECRET_CHALLENGE', challenge)
-    end
-
-    challenge
+    secure_session[CHALLENGE_KEY] ||= SecureRandom.hex
   end
 
+  private
+
   def respond_to_suspicious_request
     if suspicious?(params)
       render json: {
diff --git a/lib/secure_session.rb b/lib/secure_session.rb
index bced4807d9..6b8efe57c1 100644
--- a/lib/secure_session.rb
+++ b/lib/secure_session.rb
@@ -6,15 +6,36 @@ class SecureSession
     @prefix = prefix
   end
 
+  def self.expiry
+    @expiry ||= 1.hour.to_i
+  end
+
+  def self.expiry=(val)
+    @expiry = val
+  end
+
+  def set(key, val, expires: nil)
+    expires ||= SecureSession.expiry
+    $redis.setex(prefixed_key(key), SecureSession.expiry.to_i, val.to_s)
+    true
+  end
+
   def [](key)
-    $redis.get("#{@prefix}#{key}")
+    $redis.get(prefixed_key(key))
   end
 
   def []=(key, val)
     if val == nil
-      $redis.del("#{@prefix}#{key}")
+      $redis.del(prefixed_key(key))
     else
-      $redis.setex("#{@prefix}#{key}", 1.hour, val.to_s)
+      $redis.setex(prefixed_key(key), SecureSession.expiry.to_i, val.to_s)
     end
+    val
+  end
+
+  private
+
+  def prefixed_key(key)
+    "#{@prefix}#{key}"
   end
 end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 26a952fca5..40bc5322eb 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -5,6 +5,41 @@ require 'rails_helper'
 describe UsersController do
   let(:user) { Fabricate(:user) }
 
+  describe "#full account registration flow" do
+    it "will correctly handle honeypot and challenge" do
+
+      get '/u/hp.json'
+      expect(response.status).to eq(200)
+
+      json = JSON.parse(response.body)
+
+      params = {
+        email: 'jane@jane.com',
+        name: 'jane',
+        username: 'jane',
+        password_confirmation: json['value'],
+        challenge: json['challenge'].reverse,
+        password: SecureRandom.hex
+      }
+
+      secure_session = SecureSession.new(session["secure_session_id"])
+
+      expect(secure_session[UsersController::HONEYPOT_KEY]).to eq(json["value"])
+      expect(secure_session[UsersController::CHALLENGE_KEY]).to eq(json["challenge"])
+
+      post '/u.json', params: params
+
+      expect(response.status).to eq(200)
+
+      jane = User.find_by(username: 'jane')
+
+      expect(jane.email).to eq('jane@jane.com')
+
+      expect(secure_session[UsersController::HONEYPOT_KEY]).to eq(nil)
+      expect(secure_session[UsersController::CHALLENGE_KEY]).to eq(nil)
+    end
+  end
+
   describe '#perform_account_activation' do
     let(:token) do
       return @token if @token.present?
@@ -1020,22 +1055,15 @@ describe UsersController do
 
     shared_examples 'honeypot fails' do
       it 'should not create a new user' do
+        User.any_instance.expects(:enqueue_welcome_message).never
+
         expect {
           post "/u.json", params: create_params
         }.to_not change { User.count }
-        expect(response.status).to eq(200)
-      end
 
-      it 'should not send an email' do
-        User.any_instance.expects(:enqueue_welcome_message).never
-        post "/u.json", params: create_params
         expect(response.status).to eq(200)
-      end
 
-      it 'should say it was successful' do
-        post "/u.json", params: create_params
         json = JSON::parse(response.body)
-        expect(response.status).to eq(200)
         expect(json["success"]).to eq(true)
 
         # should not change the session
@@ -3361,7 +3389,6 @@ describe UsersController do
         end
 
         it 'succeeds on correct password' do
-          session = {}
           ApplicationController.any_instance.stubs(:secure_session).returns("confirmed-password-#{user.id}" => "true")
           post "/users/create_second_factor_totp.json"
 

From 600233482f3bf499e7655a1596908eee32f8cbbb Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 16 Oct 2019 12:26:36 +0530
Subject: [PATCH 051/328] FIX: include topic link when inviting existing users
 to a topic/PM FEATURE: allow staff to use topic_url for customizing email
 template

---
 app/mailers/user_notifications.rb |  3 ++-
 config/locales/server.en.yml      | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 28e154f8de..e74c94e8e2 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -566,7 +566,8 @@ class UserNotifications < ActionMailer::Base
         topic_title: gsub_emoji_to_unicode(title),
         topic_excerpt: topic_excerpt,
         site_title: SiteSetting.title,
-        site_description: SiteSetting.site_description
+        site_description: SiteSetting.site_description,
+        topic_url: post.topic.url
       )
 
       html = PrettyText.cook(message, sanitize: false).html_safe
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index bcefb89f45..1e72fbf09b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2593,7 +2593,7 @@ en:
         The community flagged this post and now it is hidden. **Because this post has been hidden more than once, your post will now remain hidden until it is handled by a staff member.**
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
-    
+
     flags_disagreed:
       title: "Flagged post restored by staff"
       subject_template: "Flagged post restored by staff"
@@ -2609,7 +2609,7 @@ en:
         %{flagged_post_raw_content}
         ```
         [/details]
-  
+
     flags_agreed_and_post_deleted:
       title: "Flagged post removed by staff"
       subject_template: "Flagged post removed by staff"
@@ -3089,7 +3089,7 @@ en:
         We have some new advice and recommendations for you based on your current site settings.
 
         [Visit your site dashboard](%{base_url}/admin) to see it.
-        
+
         If nothing is visible on your dashboard, another staff member may have already acted on this advice. A list of staff actions can be found in your [Staff Action Logs](%{base_url}/admin/logs/staff_action_logs).
 
     new_user_of_the_month:
@@ -3152,7 +3152,7 @@ en:
     invited_group_to_private_message_body: |
       %{username} invited @%{group_name} to a message
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
@@ -3160,10 +3160,14 @@ en:
 
       > %{site_title} -- %{site_description}
 
+      To join the message, click the link below:
+
+      %{topic_url}
+
     invited_to_private_message_body: |
       %{username} invited you to a message
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
@@ -3171,10 +3175,14 @@ en:
 
       > %{site_title} -- %{site_description}
 
+      To join the message, click the link below:
+
+      %{topic_url}
+
     invited_to_topic_body: |
       %{username} invited you to a discussion
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
@@ -3182,6 +3190,10 @@ en:
 
       > %{site_title} -- %{site_description}
 
+      To join the discussion, click the link below:
+
+      %{topic_url}
+
     user_invited_to_private_message_pm_group:
       title: "User Invited Group to PM"
       subject_template: "[%{email_prefix}] %{username} invited @%{group_name} to a message '%{topic_title}'"

From c596d7df777d94dc071c8d1582644df2eb41f108 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 16 Oct 2019 12:50:30 +0530
Subject: [PATCH 052/328] FIX: respect private_email setting for user invited
 notification email

---
 app/mailers/user_notifications.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index e74c94e8e2..bdf9c85698 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -558,7 +558,12 @@ class UserNotifications < ActionMailer::Base
         end
 
       topic_excerpt = post.excerpt.tr("\n", " ") if post.is_first_post? && post.excerpt
-      topic_excerpt = "" if SiteSetting.private_email?
+      topic_url = post.topic&.url
+
+      if SiteSetting.private_email?
+        topic_excerpt = ""
+        topic_url = ""
+      end
 
       message = I18n.t(invite_template,
         username: username,
@@ -567,7 +572,7 @@ class UserNotifications < ActionMailer::Base
         topic_excerpt: topic_excerpt,
         site_title: SiteSetting.title,
         site_description: SiteSetting.site_description,
-        topic_url: post.topic.url
+        topic_url: topic_url
       )
 
       html = PrettyText.cook(message, sanitize: false).html_safe

From 5a543f8abd97634f7791e37f18e1eca4e9a98418 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 16 Oct 2019 10:05:46 +0200
Subject: [PATCH 053/328] FIX: prevents trash button to get focus when
 submiting input on profile (#8198)

This is a default behavior for browsers to submit using first button which doesn't have `type="button"` in a form when pressing enter inside an input.
---
 .../templates/components/image-uploader.hbs   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 24f33864fe..e0d4ffe77a 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -9,15 +9,21 @@
     </label>
 
     {{#if imageUrl}}
-      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{d-icon "far-trash-alt"}}</button>
-    {{/if}}
+      {{d-button
+        action=(action "trash")
+        class="btn-danger pad-left no-text"
+        icon="far-trash-alt"
+        type="button"
+      }}
 
-    {{#if imageUrl}}
-      {{d-button icon="discourse-expand"
-          title='expand'
-          class="btn image-uploader-lightbox-btn no-text"
-          action=(action "toggleLightbox")
-          disabled=loadingLightbox}}
+      {{d-button
+        icon="discourse-expand"
+        title="expand"
+        type="button"
+        class="image-uploader-lightbox-btn no-text"
+        action=(action "toggleLightbox")
+        disabled=loadingLightbox
+      }}
     {{/if}}
 
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>

From 02250bd91f6618caf95447e113040d6df48d6166 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 16 Oct 2019 10:50:43 +0200
Subject: [PATCH 054/328] DEV: removes one deprecation with app-events:main

---
 .../javascripts/discourse-common/mixins/focus-event.js.es6      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
index c0395b53ac..3f70e353b8 100644
--- a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
+++ b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
@@ -26,7 +26,7 @@ export default Ember.Mixin.create({
 
   _onChange() {
     const container = getOwner(this);
-    const appEvents = container.lookup("app-events:main");
+    const appEvents = container.lookup("service:app-events");
 
     if (document.visibilityState === "hidden") {
       if (Discourse.hasFocus) {

From 1b8be069e5c43053b2b31b2e4f81a0d6b5fe2066 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 16 Oct 2019 14:44:48 +0100
Subject: [PATCH 055/328] DEV: Disable better_errors when developing with more
 than one worker (#8201)

From the better_errors README:

> Better Errors works by leaving a lot of context in server process memory. If you're using a web server that runs multiple "workers" it's likely that a second request (as happens when you click on a stack frame) will hit a different worker. That worker won't have the necessary context in memory, and you'll see a Session Expired message.
---
 config/environments/development.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6c080046d7..473347772f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -40,6 +40,11 @@ Discourse::Application.configure do
 
   BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']
 
+  if defined?(Unicorn) && ENV["UNICORN_WORKERS"].to_i != 1
+    # BetterErrors doesn't work with multiple unicorn workers. Disable it to avoid confusion
+    Rails.configuration.middleware.delete BetterErrors::Middleware
+  end
+
   config.load_mini_profiler = true
   if hosts = ENV['DISCOURSE_DEV_HOSTS']
     config.hosts.concat(hosts.split(","))

From 7ba914f1e10d90b1e4d25b0ab2427c94df456eae Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 16 Oct 2019 13:53:33 +0100
Subject: [PATCH 056/328] FIX: Add migrations to fix index on category slugs

Slugs can be the empty string, but the added index didn't account for
that. This commit changes the migration, stopping it from being unique
so that it can be applied everywhere and adds another migration that
recreates the index properly.
---
 app/models/category.rb                            |  4 ++--
 ...8124357_add_unique_index_categories_on_slug.rb |  3 +--
 .../20191016124059_fix_category_slugs_index.rb    | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20191016124059_fix_category_slugs_index.rb

diff --git a/app/models/category.rb b/app/models/category.rb
index db500e6ff6..2dcdd7d1e8 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -889,6 +889,6 @@ end
 #  index_categories_on_reviewable_by_group_id  (reviewable_by_group_id)
 #  index_categories_on_search_priority         (search_priority)
 #  index_categories_on_topic_count             (topic_count)
-#  unique_index_categories_on_name             (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE
-#  unique_index_categories_on_slug             (COALESCE(parent_category_id, '-1'::integer), slug) UNIQUE
+#  unique_index_categories_on_name             ((COALESCE(parent_category_id, '-1'::integer)), name) UNIQUE
+#  unique_index_categories_on_slug             ((COALESCE(parent_category_id, '-1'::integer)), slug) UNIQUE WHERE ((slug)::text <> ''::text)
 #
diff --git a/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb b/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb
index 5ee97c6482..7c9dad67e3 100644
--- a/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb
+++ b/db/migrate/20191008124357_add_unique_index_categories_on_slug.rb
@@ -5,8 +5,7 @@ class AddUniqueIndexCategoriesOnSlug < ActiveRecord::Migration[6.0]
     add_index(
       :categories,
       'COALESCE(parent_category_id, -1), slug',
-      name: 'unique_index_categories_on_slug',
-      unique: true
+      name: 'unique_index_categories_on_slug'
     )
   end
 end
diff --git a/db/migrate/20191016124059_fix_category_slugs_index.rb b/db/migrate/20191016124059_fix_category_slugs_index.rb
new file mode 100644
index 0000000000..58b67b6fe6
--- /dev/null
+++ b/db/migrate/20191016124059_fix_category_slugs_index.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class FixCategorySlugsIndex < ActiveRecord::Migration[6.0]
+  def change
+    remove_index(:categories, name: 'unique_index_categories_on_slug')
+
+    add_index(
+      :categories,
+      'COALESCE(parent_category_id, -1), slug',
+      name: 'unique_index_categories_on_slug',
+      where: "slug != ''",
+      unique: true
+    )
+  end
+end

From c6e255f4e00400b8a6f82a799b7fa082b17adb1c Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 16 Oct 2019 10:17:27 -0400
Subject: [PATCH 057/328] UX: Include metadata in composer link modal search
 results

Metadata includes topic status (closed, pinned, solved, etc.) as well as category and tags.
---
 .../controllers/insert-hyperlink.js.es6          |  2 +-
 .../templates/modal/insert-hyperlink.hbs         | 16 ++++++++++++----
 app/assets/stylesheets/common/base/modal.scss    | 10 +++++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index 313ab332c3..82d3a7250b 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -169,7 +169,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       if (!e.metaKey && !e.ctrlKey) {
         e.preventDefault();
         e.stopPropagation();
-        this.selectLink(e.target);
+        this.selectLink(e.target.closest(".search-link"));
       }
     },
     search() {
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index ec15a2b501..b32fdc42fa 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -11,13 +11,21 @@
       {{/if}}
       {{#if searchResults}}
         <div class="internal-link-results">
-          {{#each searchResults as |r index|}}
+          {{#each searchResults as |result|}}
             <a
               class="search-link"
-              href="{{r.url}}"
+              href="{{result.url}}"
               onclick={{action "linkClick"}}
-              data-title="{{r.title}}">
-              {{replace-emoji r.fancy_title}}
+              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>
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 44f7c2fbf2..ced3985e74 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -225,7 +225,7 @@
           max-height: 150px;
           width: 90%;
           overflow-y: auto;
-          > a {
+          > .search-link {
             padding: 6px;
             border-bottom: 1px solid $primary-low;
             cursor: pointer;
@@ -234,6 +234,14 @@
             &:focus {
               background-color: $highlight-medium;
             }
+            .search-category {
+              display: flex;
+              align-items: center;
+            }
+            .discourse-tags {
+              display: inline-block;
+              font-size: $font-down-1;
+            }
           }
         }
       }

From 1c4baadc4970104c28d9fdb403f4139086c30808 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 16 Oct 2019 10:39:40 -0400
Subject: [PATCH 058/328] UX: Wrap digest email footer in a table for better
 alignment options

---
 app/views/user_notifications/digest.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 2559e26595..133244e499 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -401,12 +401,16 @@
 
 <%= digest_custom_html("above_footer") %>
 
-<div dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='summary-footer'>
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='summary-footer' style="width: 100%">
+  <tr>
+    <td align="center">
   <%=raw(t 'user_notifications.digest.unsubscribe',
            site_link: html_site_link(@anchor_color),
            email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),
            unsubscribe_link: link_to(t('user_notifications.digest.click_here'), "#{Discourse.base_url}/email/unsubscribe/#{@unsubscribe_key}", {:style=>"color: ##{@anchor_color}"}))  %>
-</div>
+    </td>
+  </tr>
+</table>
 
 <%= digest_custom_html("below_footer") %>
 

From e4424d7c2e4f1060d5e5d7e33bc595add2f77248 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 16 Oct 2019 10:59:06 -0400
Subject: [PATCH 059/328] FIX: Do not make notification API call if push_url is
 blank

Followup to 77643931bcf89bef317c5b6236a81ac2eafae323
---
 app/jobs/regular/push_notification.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/regular/push_notification.rb b/app/jobs/regular/push_notification.rb
index 415152422e..6773bf4585 100644
--- a/app/jobs/regular/push_notification.rb
+++ b/app/jobs/regular/push_notification.rb
@@ -20,7 +20,7 @@ module Jobs
           notification.merge(client_id: client_id)
         end
 
-        next unless push_url
+        next unless push_url.present?
 
         result = Excon.post(push_url,
           body: payload.merge(notifications: notifications).to_json,

From d6118c8bc86a8ac0edd0a878b17671e15be1b760 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 16 Oct 2019 11:22:33 -0400
Subject: [PATCH 060/328] Add digest email template classes for popular post
 section

---
 app/views/user_notifications/digest.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 133244e499..3d3914999e 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -217,7 +217,7 @@
 
 <% if @popular_posts.present? %>
 
-<center style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding: 20px 0;font-family:Helvetica,Arial,sans-serif;">
+<center class="header-popular-posts" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding: 20px 0;font-family:Helvetica,Arial,sans-serif;">
   <%=t 'user_notifications.digest.popular_posts' %>
 </center>
 
@@ -229,7 +229,7 @@
 <% @popular_posts.each do |post| %>
 
 <!--   Beginning of Popular Post   -->
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+<table class="popular-post-excerpt" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
   <tbody>
     <tr>
       <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;font-weight:normal;padding:16px;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%;">
@@ -239,7 +239,7 @@
   </tbody>
 </table>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-spacing:0;background-color:#f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="popular-post-spacer" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-spacing:0;background-color:#f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
       <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;">
@@ -249,7 +249,7 @@
   </tbody>
 </table>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#f3f3f3;padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="popular-post-meta" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#f3f3f3;padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
       <td style="padding:0 8px 8px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;width:50px;vertical-align:top;">

From 48c123849228cc8a392e989558fe89734cd02656 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 16 Oct 2019 11:27:07 -0400
Subject: [PATCH 061/328] FIX: Do not send notification to empty push_url

Completes e4424d7
---
 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 3fe1a8899a..bcf1f05385 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -453,7 +453,7 @@ class PostAlerter
     if SiteSetting.allow_user_api_key_scopes.split("|").include?("push") && SiteSetting.allowed_user_api_push_urls.present?
       clients = user.user_api_keys
         .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes))")
-        .where("push_url IS NOT NULL")
+        .where("push_url IS NOT NULL AND push_url <> ''")
         .where("position(push_url IN ?) > 0", SiteSetting.allowed_user_api_push_urls)
         .where("revoked_at IS NULL")
         .pluck(:client_id, :push_url)

From a37dafdd4dc7c5379b71a37c6b15b788ff641ee8 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 16 Oct 2019 13:40:05 -0400
Subject: [PATCH 062/328] FIX: Use the quote generator in the example text

This way if a plugin customizes the quotes the example will match.
---
 .../discourse-narrative-bot/config/locales/server.en.yml  | 2 +-
 .../lib/discourse_narrative_bot/quote_generator.rb        | 6 +++++-
 .../lib/discourse_narrative_bot/track_selector.rb         | 1 +
 .../spec/discourse_narrative_bot/track_selector_spec.rb   | 8 ++++++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 5a796fa6a7..5163997e31 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -124,7 +124,7 @@ en:
           > :game_die: 3, 6
 
           `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Carry out a random act of kindness, with no expectation of reward, safe in the knowledge that one day someone might do the same for you_ &mdash; Princess Diana
+          %{quote_sample}
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: You may rely on it
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/quote_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/quote_generator.rb
index 8934547687..2de214c501 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/quote_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/quote_generator.rb
@@ -6,6 +6,10 @@ module DiscourseNarrativeBot
   class QuoteGenerator
     API_ENDPOINT = 'http://api.forismatic.com/api/1.0/'.freeze
 
+    def self.format_quote(quote, author)
+      I18n.t('discourse_narrative_bot.quote.results', quote: quote, author: author)
+    end
+
     def self.generate(user)
       quote, author =
         if !user.effective_locale.start_with?('en')
@@ -23,7 +27,7 @@ module DiscourseNarrativeBot
           [response_body["quoteText"].strip, response_body["quoteAuthor"].strip]
         end
 
-      I18n.t('discourse_narrative_bot.quote.results', quote: quote, author: author)
+      format_quote(quote, author)
     end
   end
 end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
index bdebd27580..90f1f58626 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
@@ -178,6 +178,7 @@ module DiscourseNarrativeBot
         discobot_username: discobot_username,
         dice_trigger: self.class.dice_trigger,
         quote_trigger: self.class.quote_trigger,
+        quote_sample: DiscourseNarrativeBot::QuoteGenerator.generate(@user),
         magic_8_ball_trigger: self.class.magic_8_ball_trigger
       )}"
     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 18466d156c..e2a398a56f 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
@@ -14,6 +14,11 @@ describe DiscourseNarrativeBot::TrackSelector do
     )
   end
 
+  before do
+    stub_request(:get, "http://api.forismatic.com/api/1.0/?format=json&lang=en&method=getQuote").
+      to_return(status: 200, body: "{\"quoteText\":\"Be Like Water\",\"quoteAuthor\":\"Bruce Lee\"}")
+  end
+
   let(:help_message) do
     discobot_username = discobot_user.username
 
@@ -30,6 +35,7 @@ describe DiscourseNarrativeBot::TrackSelector do
       discobot_username: discobot_username,
       dice_trigger: described_class.dice_trigger,
       quote_trigger: described_class.quote_trigger,
+      quote_sample: DiscourseNarrativeBot::QuoteGenerator.format_quote('Be Like Water', 'Bruce Lee'),
       magic_8_ball_trigger: described_class.magic_8_ball_trigger
     )}
     RAW
@@ -577,8 +583,6 @@ describe DiscourseNarrativeBot::TrackSelector do
 
         describe 'when a quote is requested' do
           it 'should create the right reply' do
-            stub_request(:get, "http://api.forismatic.com/api/1.0/?format=json&lang=en&method=getQuote").
-              to_return(status: 200, body: "{\"quoteText\":\"Be Like Water\",\"quoteAuthor\":\"Bruce Lee\"}")
 
             post.update!(raw: "@discobot quote")
             described_class.new(:reply, user, post_id: post.id).select

From 61f6a6e8369401cc2819c854e2bb11432377927c Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 16 Oct 2019 11:59:42 -0400
Subject: [PATCH 063/328] Remove focus from specs

---
 spec/components/discourse_diff_spec.rb | 2 +-
 spec/components/onpdiff_spec.rb        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index d1158aef20..d8683decc8 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -76,7 +76,7 @@ describe DiscourseDiff do
       expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a paragraph</p></div><div class=\"revision-content\"><p>this is a <ins>great </ins>paragraph</p></div>")
     end
 
-    it "adds <ins> and <del> tags on consecutive paragraphs", :focus do
+    it "adds <ins> and <del> tags on consecutive paragraphs" do
       before = "<p>this is one paragraph</p><p>here is yet another</p>"
       after = "<p>this is one great paragraph</p><p>here is another</p>"
       got = DiscourseDiff.new(before, after).side_by_side_html
diff --git a/spec/components/onpdiff_spec.rb b/spec/components/onpdiff_spec.rb
index 60b4039720..f59bd80cb0 100644
--- a/spec/components/onpdiff_spec.rb
+++ b/spec/components/onpdiff_spec.rb
@@ -49,7 +49,7 @@ describe ONPDiff do
       expect(ONPDiff.new("abc", "acd").paragraph_diff).to eq([["a", :common], ["b", :delete], ["c", :common], ["d", :add]])
     end
 
-    it "pairs as many elements as possible", :focus do
+    it "pairs as many elements as possible" do
       expect(ONPDiff.new("abcd", "abef").paragraph_diff).to eq([
         ["a", :common], ["b", :common],
         ["e", :add], ["c", :delete],

From 5ef49692e08fdb57e89042810cda9497c1f3be04 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 16 Oct 2019 14:27:30 -0400
Subject: [PATCH 064/328] FIX: tag cannot be used if it belongs to two tag
 groups with parent tag

If two tag groups exist with a mandatory parent tag, and one tag is
added to both tag groups, then the tag couldn't be used on any topics.
---
 lib/discourse_tagging.rb                  | 35 ++++++++++++++++++-----
 spec/components/discourse_tagging_spec.rb | 15 +++++++++-
 spec/integration/category_tag_spec.rb     | 17 +++++++++++
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 0213eb73fc..e8bb6b96ec 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -65,16 +65,27 @@ module DiscourseTagging
         end
 
         # add missing mandatory parent tags
-        parent_tags = TagGroup.includes(:parent_tag).where("tag_groups.id IN (
-          SELECT tg.id
+        tag_ids = tags.map(&:id)
+
+        parent_tags_map = DB.query("
+          SELECT tgm.tag_id, tg.parent_tag_id
             FROM tag_groups tg
       INNER JOIN tag_group_memberships tgm
               ON tgm.tag_group_id = tg.id
            WHERE tg.parent_tag_id IS NOT NULL
-             AND tgm.tag_id IN (?))", tags.map(&:id)).map(&:parent_tag)
+             AND tgm.tag_id IN (?)
+        ", tag_ids).inject({}) do |h, v|
+          h[v.tag_id] ||= []
+          h[v.tag_id] << v.parent_tag_id
+          h
+        end
 
-        parent_tags.reject { |t| tag_names.include?(t.name) }.each do |tag|
-          tags << tag
+        missing_parent_tag_ids = parent_tags_map.map do |_, parent_tag_ids|
+          (tag_ids & parent_tag_ids).size == 0 ? parent_tag_ids.first : nil
+        end.compact.uniq
+
+        unless missing_parent_tag_ids.empty?
+          tags = tags + Tag.where(id: missing_parent_tag_ids).all
         end
 
         # validate minimum required tags for a category
@@ -187,8 +198,18 @@ module DiscourseTagging
         exclude_group_ids = one_per_topic_group_ids(selected_tag_ids)
 
         if exclude_group_ids.empty?
-          sql = "tags.id NOT IN (#{TAG_GROUP_TAG_IDS_SQL} WHERE tg.parent_tag_id NOT IN (?))"
-          query = query.where(sql, selected_tag_ids)
+          # tags that don't belong to groups that require a parent tag,
+          # and tags that belong to groups with parent tag selected
+          query = query.where(<<~SQL, selected_tag_ids, selected_tag_ids)
+            tags.id NOT IN (
+              #{TAG_GROUP_TAG_IDS_SQL}
+              WHERE tg.parent_tag_id NOT IN (?)
+            )
+            OR tags.id IN (
+              #{TAG_GROUP_TAG_IDS_SQL}
+              WHERE tg.parent_tag_id IN (?)
+            )
+          SQL
         else
           # It's possible that the selected tags violate some one-tag-per-group restrictions,
           # so filter them out by picking one from each group.
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
index 3dfa17662c..d269ffd5ec 100644
--- a/spec/components/discourse_tagging_spec.rb
+++ b/spec/components/discourse_tagging_spec.rb
@@ -194,9 +194,9 @@ describe DiscourseTagging do
     context 'tag group with parent tag' do
       let(:topic) { Fabricate(:topic, user: user) }
       let(:post) { Fabricate(:post, user: user, topic: topic, post_number: 1) }
+      let(:tag_group) { Fabricate(:tag_group, parent_tag_id: tag1.id) }
 
       before do
-        tag_group = Fabricate(:tag_group, parent_tag_id: tag1.id)
         tag_group.tags = [tag3]
       end
 
@@ -222,6 +222,19 @@ describe DiscourseTagging do
           *[tag1, tag2, tag3, parent_tag].map(&:name)
         )
       end
+
+      it "adds only the necessary parent tags" do
+        common = Fabricate(:tag, name: 'common')
+        tag_group.tags = [tag3, common]
+
+        parent_tag = Fabricate(:tag, name: 'parent')
+        tag_group2 = Fabricate(:tag_group, parent_tag_id: parent_tag.id)
+        tag_group2.tags = [tag2, common]
+
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [parent_tag.name, common.name])
+        expect(valid).to eq(true)
+        expect(topic.reload.tags.map(&:name)).to contain_exactly(*[parent_tag, common].map(&:name))
+      end
     end
   end
 
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
index b20829778b..9fddfb35cc 100644
--- a/spec/integration/category_tag_spec.rb
+++ b/spec/integration/category_tag_spec.rb
@@ -212,6 +212,23 @@ describe "category tag restrictions" do
       expect(filter_allowed_tags(for_topic: true, selected_tags: [tag1.name, tag3.name])).to contain_exactly(tag1, tag2, tag3, tag4)
     end
 
+    it "filter_allowed_tags returns tags common to more than one tag group with parent tag" do
+      common = Fabricate(:tag, name: 'common')
+      tag_group = Fabricate(:tag_group, parent_tag_id: tag1.id)
+      tag_group.tags = [tag2, common]
+      tag_group = Fabricate(:tag_group, parent_tag_id: tag3.id)
+
+      tag_group.tags = [tag4]
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag1, tag3)
+      expect(filter_allowed_tags(for_input: true, selected_tags: [tag1.name])).to contain_exactly(tag2, tag3, common)
+      expect(filter_allowed_tags(for_input: true, selected_tags: [tag3.name])).to contain_exactly(tag4, tag1)
+
+      tag_group.tags = [tag4, common]
+      expect(filter_allowed_tags(for_input: true)).to contain_exactly(tag1, tag3)
+      expect(filter_allowed_tags(for_input: true, selected_tags: [tag1.name])).to contain_exactly(tag2, tag3, common)
+      expect(filter_allowed_tags(for_input: true, selected_tags: [tag3.name])).to contain_exactly(tag4, tag1, common)
+    end
+
     context "and category restrictions" do
       fab!(:car_category)    { Fabricate(:category) }
       fab!(:other_category)  { Fabricate(:category) }

From 74207ef03a62e1193dc98161f38abbd8e7a80dc4 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 16 Oct 2019 14:36:54 -0400
Subject: [PATCH 065/328] Refactor `search_answer` to be dynamically inserted
 so it can be changed

---
 .../discourse-narrative-bot/config/locales/server.en.yml  | 2 +-
 .../lib/discourse_narrative_bot/new_user_narrative.rb     | 8 +++++---
 .../discourse_narrative_bot/new_user_narrative_spec.rb    | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 5163997e31..f0d54c7f55 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -293,7 +293,7 @@ en:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Did you notice you’re now back at the beginning? Feed this poor hungry capybara by **replying with the `:herb:` emoji** and you’ll be automatically taken to the end.
+          Did you notice you’re now back at the beginning? Feed this poor hungry capybara by **replying with the `%{search_answer}` emoji** and you’ll be automatically taken to the end.
         reply: |-
           Yay you found it :tada:
 
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 df134ac42d..f85854c32d 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,7 +117,9 @@ module DiscourseNarrativeBot
       }
     }
 
-    SEARCH_ANSWER = ':herb:'.freeze
+    def self.search_answer
+      ':herb:'
+    end
 
     def self.reset_trigger
       I18n.t('discourse_narrative_bot.new_user_narrative.reset_trigger')
@@ -152,7 +154,7 @@ module DiscourseNarrativeBot
       raw = <<~RAW
       #{post.raw}
 
-      #{I18n.t("#{I18N_KEY}.search.hidden_message", i18n_post_args)}
+      #{I18n.t("#{I18N_KEY}.search.hidden_message", i18n_post_args.merge(search_answer: NewUserNarrative.search_answer))}
       RAW
 
       PostRevisor.new(post, topic).revise!(
@@ -495,7 +497,7 @@ module DiscourseNarrativeBot
       post_topic_id = @post.topic_id
       return unless valid_topic?(post_topic_id)
 
-      if @post.raw.match(/#{SEARCH_ANSWER}/)
+      if @post.raw.match(/#{NewUserNarrative.search_answer}/)
         fake_delay
         reply_to(@post, I18n.t("#{I18N_KEY}.search.reply", i18n_post_args(search_url: url_helpers(:search_url))))
       else
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 1b35acd3d8..b7c5ec34d4 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
@@ -946,7 +946,9 @@ describe DiscourseNarrativeBot::NewUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_search)
 
           expect(post.reload.topic.first_post.raw).to include(I18n.t(
-            "discourse_narrative_bot.new_user_narrative.search.hidden_message", base_uri: ''
+            "discourse_narrative_bot.new_user_narrative.search.hidden_message",
+            base_uri: '',
+            search_answer: described_class.search_answer
           ))
         end
 
@@ -963,7 +965,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         it 'should create the right reply' do
           post.update!(
-            raw: "#{described_class::SEARCH_ANSWER} this is a capybara"
+            raw: "#{described_class.search_answer} this is a capybara"
           )
 
           expect do

From baf8ae604a2576c620627fce6f17a8f05b917d3f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 16 Oct 2019 15:00:45 -0400
Subject: [PATCH 066/328] FIX: Correct topic timeline position calculation

Fixes calculation for themes with tall custom headers.
---
 .../javascripts/discourse/components/topic-timeline.js.es6     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 17709a5fc7..1d9ec49b78 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -58,7 +58,8 @@ export default MountWidget.extend(Docking, {
     const mainOffset = $("#main").offset();
     const offsetTop = mainOffset ? mainOffset.top : 0;
     const topicTop = $(".container.posts").offset().top - offsetTop;
-    const topicBottom = $("#topic-bottom").offset().top;
+    const topicBottom =
+      $("#topic-bottom").offset().top - $("#main-outlet").offset().top;
     const timeline = this.element.querySelector(".timeline-container");
     const timelineHeight = (timeline && timeline.offsetHeight) || 400;
     const footerHeight = $(".timeline-footer-controls").outerHeight(true) || 0;

From 7a0c06691cc61b9a6a5bc78ff0b5e763f7750926 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 16 Oct 2019 20:03:52 +0100
Subject: [PATCH 067/328] FIX: Account for nil when looking up subcategories

---
 app/models/concerns/category_hashtag.rb          | 2 +-
 spec/components/concern/category_hashtag_spec.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/category_hashtag.rb b/app/models/concerns/category_hashtag.rb
index 8e61329b93..5a8c92f92c 100644
--- a/app/models/concerns/category_hashtag.rb
+++ b/app/models/concerns/category_hashtag.rb
@@ -12,7 +12,7 @@ module CategoryHashtag
       category = Category.where(slug: parent_slug, parent_category_id: nil)
 
       if child_slug
-        Category.where(slug: child_slug, parent_category_id: category.pluck(:id).first).first
+        Category.where(slug: child_slug, parent_category_id: category.select(:id)).first
       else
         category.first
       end
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index e446fc27d2..3d59995bab 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -25,6 +25,10 @@ describe CategoryHashtag do
       expect(Category.query_from_hashtag_slug("random-slug#{CategoryHashtag::SEPARATOR}random-slug")).to eq(nil)
     end
 
+    it "should return nil for a non-existent root and a parent subcategory" do
+      expect(Category.query_from_hashtag_slug("non-existent#{CategoryHashtag::SEPARATOR}#{parent_category.slug}")).to eq(nil)
+    end
+
     it "should be case sensitive" do
       parent_category.update!(slug: "ApPlE")
       child_category.update!(slug: "OraNGE")

From 6e9c8fe8543ccfff83029e8440136da08f83865f Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 16 Oct 2019 17:08:43 -0300
Subject: [PATCH 068/328] FIX: More encoded slug fixes (#8191)

* FIX: Do not encode the URL twice

Now that we encode slugs in the server we don't need this anymore.

Reverts fe5na33

* FIX: More places do deal with encoded slugs

* the param is a string now, not a hash

* FIX: Handle the nil slug on /categories

* DEV: Add seeded? method to identity default categories

* DEV: Use SiteSetting to keep track of seeded categories
---
 .../discourse/components/share-popup.js.es6   |  2 +-
 .../discourse/models/category.js.es6          |  6 +++++-
 app/controllers/categories_controller.rb      |  2 +-
 app/controllers/topics_controller.rb          |  6 +++---
 .../onceoff/fix_encoded_category_slugs.rb     | 17 ++++++++++++++++
 app/models/category.rb                        | 20 ++++++++++++++++++-
 app/models/topic.rb                           |  9 +++++++++
 config/site_settings.yml                      |  1 +
 8 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 app/jobs/onceoff/fix_encoded_category_slugs.rb

diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index dad5d68949..10e723a196 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -85,7 +85,7 @@ export default Ember.Component.extend({
     if (!this.site.mobileView) {
       $this.css({ left: "" + x + "px" });
     }
-    this.set("link", encodeURI(url));
+    this.set("link", url);
     this.set("visible", true);
 
     Ember.run.scheduleOnce("afterRender", this, this._focusUrl);
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 8f53b70f5d..11bdbf9b8a 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -243,7 +243,11 @@ Category.reopenClass({
   },
 
   findSingleBySlug(slug) {
-    return Category.list().find(c => Category.slugFor(c) === slug);
+    if (Discourse.SiteSettings.slug_generation_method !== "encoded") {
+      return Category.list().find(c => Category.slugFor(c) === slug);
+    } else {
+      return Category.list().find(c => Category.slugFor(c) === encodeURI(slug));
+    }
   },
 
   findById(id) {
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index a548e6c815..c20c08bcac 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -18,7 +18,7 @@ class CategoriesController < ApplicationController
 
     @description = SiteSetting.site_description
 
-    parent_category = Category.find_by(slug: params[:parent_category_id]) || Category.find_by(id: params[:parent_category_id].to_i)
+    parent_category = Category.find_by_slug(params[:parent_category_id]) || Category.find_by(id: params[:parent_category_id].to_i)
 
     category_options = {
       is_homepage: current_homepage == "categories".freeze,
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index d806413fbc..1b2bc12702 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -36,7 +36,7 @@ class TopicsController < ApplicationController
   skip_before_action :check_xhr, only: [:show, :feed]
 
   def id_for_slug
-    topic = Topic.find_by(slug: params[:slug].downcase)
+    topic = Topic.find_by_slug(params[:slug])
     guardian.ensure_can_see!(topic)
     raise Discourse::NotFound unless topic
     render json: { slug: topic.slug, topic_id: topic.id, url: topic.url }
@@ -64,7 +64,7 @@ class TopicsController < ApplicationController
     # Special case: a slug with a number in front should look by slug first before looking
     # up that particular number
     if params[:id] && params[:id] =~ /^\d+[^\d\\]+$/
-      topic = Topic.find_by(slug: params[:id].downcase)
+      topic = Topic.find_by_slug(params[:id])
       return redirect_to_correct_topic(topic, opts[:post_number]) if topic
     end
 
@@ -81,7 +81,7 @@ class TopicsController < ApplicationController
       @topic_view = TopicView.new(params[:id] || params[:topic_id], current_user, opts)
     rescue Discourse::NotFound => ex
       if params[:id]
-        topic = Topic.find_by(slug: params[:id].downcase)
+        topic = Topic.find_by_slug(params[:id])
         return redirect_to_correct_topic(topic, opts[:post_number]) if topic
       end
 
diff --git a/app/jobs/onceoff/fix_encoded_category_slugs.rb b/app/jobs/onceoff/fix_encoded_category_slugs.rb
new file mode 100644
index 0000000000..28947125d9
--- /dev/null
+++ b/app/jobs/onceoff/fix_encoded_category_slugs.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  class FixEncodedCategorySlugs < ::Jobs::Onceoff
+    def execute_onceoff(args)
+      return unless SiteSetting.slug_generation_method == 'encoded'
+
+      #Make custom categories slugs nil and let the app regenerate with proper encoded ones
+      Category.all.reject { |c| c.seeded? }.each do |c|
+        c.slug = nil
+        c.save!
+      end
+    end
+  end
+
+end
diff --git a/app/models/category.rb b/app/models/category.rb
index 2dcdd7d1e8..e76089baad 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -612,7 +612,8 @@ class Category < ActiveRecord::Base
   end
 
   def self.query_category(slug_or_id, parent_category_id)
-    self.where(slug: slug_or_id, parent_category_id: parent_category_id).first ||
+    encoded_slug_or_id = CGI.escape(slug_or_id) if SiteSetting.slug_generation_method == 'encoded'
+    self.where(slug: (encoded_slug_or_id || slug_or_id), parent_category_id: parent_category_id).first ||
     self.where(id: slug_or_id.to_i, parent_category_id: parent_category_id).first
   end
 
@@ -629,6 +630,15 @@ class Category < ActiveRecord::Base
     id == SiteSetting.uncategorized_category_id
   end
 
+  def seeded?
+    [
+      SiteSetting.lounge_category_id,
+      SiteSetting.meta_category_id,
+      SiteSetting.staff_category_id,
+      SiteSetting.uncategorized_category_id,
+    ].include? id
+  end
+
   @@url_cache = DistributedCache.new('category_url')
 
   def clear_url_cache
@@ -708,6 +718,14 @@ class Category < ActiveRecord::Base
   end
 
   def self.find_by_slug(category_slug, parent_category_slug = nil)
+
+    return nil if category_slug.nil?
+
+    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)
+    end
+
     if parent_category_slug
       parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).select(:id)
 
diff --git a/app/models/topic.rb b/app/models/topic.rb
index ed98ba47f3..9061198bab 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -988,6 +988,15 @@ class Topic < ActiveRecord::Base
     slug
   end
 
+  def self.find_by_slug(slug)
+    if SiteSetting.slug_generation_method != "encoded"
+      Topic.find_by(slug: slug.downcase)
+    else
+      encoded_slug = CGI.escape(slug)
+      Topic.find_by(slug: encoded_slug)
+    end
+  end
+
   def title=(t)
     slug = Slug.for(t.to_s)
     write_attribute(:slug, slug)
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 2f3962e4c0..603ac3cc89 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1730,6 +1730,7 @@ uncategorized:
   slug_generation_method:
     default: "ascii"
     enum: "SlugSetting"
+    client: true
     locale_default:
       ja: "none"
       zh_CN: "none"

From f14020dd0a0d7eeb386dbde9e52da4b999acb4c8 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 16 Oct 2019 16:28:12 -0400
Subject: [PATCH 069/328] Allow the topic excerpt size to be customizable by
 plugins

---
 app/models/post.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index d2ad8be435..34d8d24e45 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -157,6 +157,10 @@ class Post < ActiveRecord::Base
     includes(:post_details).find_by(post_details: { key: key, value: value })
   end
 
+  def self.excerpt_size
+    220
+  end
+
   def whisper?
     post_type == Post.types[:whisper]
   end
@@ -463,7 +467,7 @@ class Post < ActiveRecord::Base
   end
 
   def excerpt_for_topic
-    Post.excerpt(cooked, 220, strip_links: true, strip_images: true, post: self)
+    Post.excerpt(cooked, Post.excerpt_size, strip_links: true, strip_images: true, post: self)
   end
 
   def is_first_post?

From c3d06ef01aeaa4b8c693ec70a69ad76b41ccfe85 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 17 Oct 2019 08:43:30 +1100
Subject: [PATCH 070/328] DEV: avoid making direct HTML changes in controllers

Followup on d5d8db7f, we prefer not to amend DOM directly from controllers.
---
 .../components/honeypot-input.js.es6          | 16 +++++++++++
 .../controllers/create-account.js.es6         | 27 +++----------------
 .../templates/modal/create-account.hbs        |  2 +-
 3 files changed, 20 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/honeypot-input.js.es6

diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js.es6 b/app/assets/javascripts/discourse/components/honeypot-input.js.es6
new file mode 100644
index 0000000000..06895b0586
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/honeypot-input.js.es6
@@ -0,0 +1,16 @@
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default Ember.TextField.extend({
+  @on("init")
+  _init() {
+    // Chrome autocomplete is buggy per:
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=987293
+    // work around issue while leaving a semi useable honeypot for
+    // bots that are running full Chrome
+    if (navigator.userAgent.indexOf("Chrome") > -1) {
+      this.set("type", "text");
+    } else {
+      this.set("type", "password");
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 0db34a4e94..eb370191e9 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -25,6 +25,7 @@ export default Ember.Controller.extend(
 
     complete: false,
     accountChallenge: 0,
+    accountHoneypot: 0,
     formSubmitted: false,
     rejectedEmails: Ember.A([]),
     prefilledUsername: null,
@@ -198,28 +199,8 @@ export default Ember.Controller.extend(
           this._challengeExpiry = 30;
         }
 
-        const confirmation = document.getElementById(
-          "new-account-confirmation"
-        );
-        if (confirmation) {
-          confirmation.value = json.value;
-        }
-
-        // Chrome autocomplete is buggy per:
-        // https://bugs.chromium.org/p/chromium/issues/detail?id=987293
-        // work around issue while leaving a semi useable honeypot for
-        // bots that are running full Chrome
-        if (confirmation && navigator.userAgent.indexOf("Chrome") > 0) {
-          const newConfirmation = document.createElement("input");
-
-          newConfirmation.type = "text";
-          newConfirmation.id = "new-account-confirmation";
-          newConfirmation.value = json.value;
-
-          confirmation.parentNode.replaceChild(newConfirmation, confirmation);
-        }
-
         this.setProperties({
+          accountHoneypot: json.value,
           accountChallenge: json.challenge
             .split("")
             .reverse()
@@ -237,9 +218,7 @@ export default Ember.Controller.extend(
         "accountChallenge"
       );
 
-      attrs["accountPasswordConfirm"] = document.getElementById(
-        "new-account-confirmation"
-      ).value;
+      attrs["accountPasswordConfirm"] = this.accountHoneypot;
 
       const userFields = this.userFields;
       const destinationUrl = this.get("authOptions.destination_url");
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index ad5dacdfc8..b5e76e633f 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -83,7 +83,7 @@
           <tr class="password-confirmation">
             <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
             <td>
-              <input autocomplete="new-password" id="new-account-confirmation" type="password">
+              {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
               {{input value=accountChallenge id="new-account-challenge"}}
             </td>
           </tr>

From ab74a50d857c6a0ac7e5c11f9d8ddd12ee5e1805 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 17 Oct 2019 08:49:23 +1100
Subject: [PATCH 071/328] FIX: update Redis gem to version 4.1.3 (#8197)

* FIX: update Redis gem to version 4.1.3

I run our benchmark on commit with hiredis and redis-4.1.3

Results:
type | hidredis | redis 4.1.3 | percent
--- | --- | --- | ---
Categories-50 | 49 | 50 | 102.04%
Categories-75 | 51 | 51 | 100.00%
Categories-90 | 63 | 64 | 101.59%
Categories-99 | 86 | 85 | 98.84%
Home-50 | 55 | 55 | 100.00%
Home-75 | 56 | 57 | 101.79%
Home-90 | 68 | 69 | 101.47%
Home-99 | 102 | 104 | 101.96%
Topic-50 | 36 | 37 | 102.78%
Topic-75 | 37 | 37 | 100.00%
Topic-90 | 47 | 48 | 102.13%
Topic-99 | 60 | 61 | 101.67%
Categories-admin-50 | 124 | 117 | 94.35%
Categories-admin-75 | 130 | 129 | 99.23%
Categories-admin-90 | 147 | 143 | 97.28%
Categories-admin-99 | 204 | 199 | 97.55%
Home-admin-50 | 146 | 148 | 101.37%
Home-admin-75 | 150 | 152 | 101.33%
Home-admin-90 | 169 | 168 | 99.41%
Home-admin-99 | 232 | 223 | 96.12%
Topic-admin-50 | 60 | 61 | 101.67%
Topic-admin-75 | 64 | 63 | 98.44%
Topic-admin-90 | 76 | 73 | 96.05%
Topic-admin-99 | 124 | 94 | 75.81%
Load rails | 2412 | 2360 | 97.84%
rss | 290204 | 295828 | 101.94%
pss | 277948 | 283624 | 102.04%

* FIX: get rid of redis freedom patch
---
 Gemfile                      |  9 +--------
 Gemfile.lock                 |  4 ++--
 config/application.rb        |  1 -
 lib/freedom_patches/redis.rb | 16 ----------------
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 lib/freedom_patches/redis.rb

diff --git a/Gemfile b/Gemfile
index d523170a4e..8f032801eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,14 +36,7 @@ gem 'mail', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
-# holding off redis upgrade temporarily as it is having issues with our current
-# freedom patch, we will follow this up.
-#
-# FrozenError: can't modify frozen Hash
-# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `delete'
-# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `initialize'
-# /var/www/discourse/lib/freedom_patches/redis.rb:7:in `initialize'
-gem 'redis', '4.0.1'
+gem 'redis', '4.1.3'
 gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index d54d718a12..bd215e663e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.0.1)
+    redis (4.1.3)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     request_store (1.4.1)
@@ -516,7 +516,7 @@ DEPENDENCIES
   rb-inotify (~> 0.9)
   rbtrace
   rchardet
-  redis (= 4.0.1)
+  redis (= 4.1.3)
   redis-namespace
   rinku
   rotp
diff --git a/config/application.rb b/config/application.rb
index dd56bf859f..a8f2fcc98f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -241,7 +241,6 @@ module Discourse
 
     require 'discourse_redis'
     require 'logster/redis_store'
-    require 'freedom_patches/redis'
     # Use redis for our cache
     config.cache_store = DiscourseRedis.new_redis_store
     $redis = DiscourseRedis.new
diff --git a/lib/freedom_patches/redis.rb b/lib/freedom_patches/redis.rb
deleted file mode 100644
index 8945ece473..0000000000
--- a/lib/freedom_patches/redis.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# https://github.com/redis/redis-rb/pull/591
-class Redis
-  class Client
-    alias_method :old_initialize, :initialize
-
-    def initialize(options = {})
-      old_initialize(options)
-
-      if options.include?(:connector) && options[:connector].is_a?(Class)
-        @connector = options[:connector].new(@options)
-      end
-    end
-  end
-end

From ae2a56999ed643136c2f90f77a3da0254040ac29 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 17 Oct 2019 11:41:46 +1100
Subject: [PATCH 072/328] Revert "FIX: update Redis gem to version 4.1.3
 (#8197)"

This reverts commit ab74a50d857c6a0ac7e5c11f9d8ddd12ee5e1805.

We really want to upgrade redis, but discovered some edge cases
around failover we need to test.

Holding off on the upgrade till a bit more testing happens
---
 Gemfile                      |  9 ++++++++-
 Gemfile.lock                 |  4 ++--
 config/application.rb        |  1 +
 lib/freedom_patches/redis.rb | 16 ++++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 lib/freedom_patches/redis.rb

diff --git a/Gemfile b/Gemfile
index 8f032801eb..d523170a4e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,14 @@ gem 'mail', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
-gem 'redis', '4.1.3'
+# holding off redis upgrade temporarily as it is having issues with our current
+# freedom patch, we will follow this up.
+#
+# FrozenError: can't modify frozen Hash
+# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `delete'
+# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `initialize'
+# /var/www/discourse/lib/freedom_patches/redis.rb:7:in `initialize'
+gem 'redis', '4.0.1'
 gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index bd215e663e..d54d718a12 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.1.3)
+    redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     request_store (1.4.1)
@@ -516,7 +516,7 @@ DEPENDENCIES
   rb-inotify (~> 0.9)
   rbtrace
   rchardet
-  redis (= 4.1.3)
+  redis (= 4.0.1)
   redis-namespace
   rinku
   rotp
diff --git a/config/application.rb b/config/application.rb
index a8f2fcc98f..dd56bf859f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -241,6 +241,7 @@ module Discourse
 
     require 'discourse_redis'
     require 'logster/redis_store'
+    require 'freedom_patches/redis'
     # Use redis for our cache
     config.cache_store = DiscourseRedis.new_redis_store
     $redis = DiscourseRedis.new
diff --git a/lib/freedom_patches/redis.rb b/lib/freedom_patches/redis.rb
new file mode 100644
index 0000000000..8945ece473
--- /dev/null
+++ b/lib/freedom_patches/redis.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# https://github.com/redis/redis-rb/pull/591
+class Redis
+  class Client
+    alias_method :old_initialize, :initialize
+
+    def initialize(options = {})
+      old_initialize(options)
+
+      if options.include?(:connector) && options[:connector].is_a?(Class)
+        @connector = options[:connector].new(@options)
+      end
+    end
+  end
+end

From b005377d0a1ffef4ffbae47387e88db40fd55f7c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 16 Oct 2019 21:40:42 -0400
Subject: [PATCH 073/328] UX: add newline after closing poll tag for poll
 builder

---
 .../poll/assets/javascripts/controllers/poll-ui-builder.js.es6  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index 9550b286b5..df1c4b0681 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -228,7 +228,7 @@ export default Ember.Controller.extend({
       });
     }
 
-    output += "[/poll]";
+    output += "[/poll]\n";
     return output;
   },
 

From 4338515a8544f3d8302403d685133a01aa6e9e5f Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 16 Oct 2019 21:53:37 -0400
Subject: [PATCH 074/328] fix poll test

---
 .../controllers/poll-ui-builder-test.js.es6      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
index d80e7c54f2..cc0fe3140b 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -220,7 +220,7 @@ test("number pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=number min=1 max=20 step=1]\n[/poll]",
+    "[poll type=number min=1 max=20 step=1]\n[/poll]\n",
     "it should return the right output"
   );
 
@@ -228,7 +228,7 @@ test("number pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=number min=1 max=20 step=2]\n[/poll]",
+    "[poll type=number min=1 max=20 step=2]\n[/poll]\n",
     "it should return the right output"
   );
 
@@ -236,7 +236,7 @@ test("number pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=number min=1 max=20 step=2 public=true]\n[/poll]",
+    "[poll type=number min=1 max=20 step=2 public=true]\n[/poll]\n",
     "it should return the right output"
   );
 
@@ -244,7 +244,7 @@ test("number pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=number min=1 max=20 step=1 public=true]\n[/poll]",
+    "[poll type=number min=1 max=20 step=1 public=true]\n[/poll]\n",
     "it should return the right output"
   );
 });
@@ -262,7 +262,7 @@ test("regular pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=regular]\n* 1\n* 2\n[/poll]",
+    "[poll type=regular]\n* 1\n* 2\n[/poll]\n",
     "it should return the right output"
   );
 
@@ -270,7 +270,7 @@ test("regular pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=regular public=true]\n* 1\n* 2\n[/poll]",
+    "[poll type=regular public=true]\n* 1\n* 2\n[/poll]\n",
     "it should return the right output"
   );
 });
@@ -289,7 +289,7 @@ test("multiple pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]",
+    "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]\n",
     "it should return the right output"
   );
 
@@ -297,7 +297,7 @@ test("multiple pollOutput", function(assert) {
 
   assert.equal(
     controller.get("pollOutput"),
-    "[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]",
+    "[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]\n",
     "it should return the right output"
   );
 });

From f5d1aff8dd0ef2df7f99d9e8619bbd34155ee83d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 17 Oct 2019 16:56:40 +1100
Subject: [PATCH 075/328] FEATURE: experimental hidden setting for draft
 backups

Under exceptional situations the automatic draft feature can fail.

This new **hidden, default off** site setting
`backup_drafts_to_pm_length` will automatically backup any draft that is
saved by the system to a dedicated PM (originating from self)

The body of that PM will contain the text of the reply.

We can enable this feature strategically on sites exhibiting issues to
diagnose issues with the draft system and offer a recourse to users who
appear to lose drafts. We automatically checkpoint these drafts every 5
minutes forcing a new revision each 5 minutes so you can revert to old
content.

Longer term we are considering automatically enabling this kind of feature
for extremely long drafts where the risk is really high one could lose
days of writing.
---
 app/models/backup_draft_post.rb               | 23 +++++
 app/models/backup_draft_topic.rb              | 22 +++++
 app/models/draft.rb                           | 90 +++++++++++++++++++
 config/locales/server.en.yml                  |  5 +-
 config/site_settings.yml                      |  4 +
 .../20191017044811_add_draft_backup_tables.rb | 25 ++++++
 lib/post_creator.rb                           |  1 +
 spec/models/draft_spec.rb                     | 77 +++++++++++-----
 8 files changed, 224 insertions(+), 23 deletions(-)
 create mode 100644 app/models/backup_draft_post.rb
 create mode 100644 app/models/backup_draft_topic.rb
 create mode 100644 db/migrate/20191017044811_add_draft_backup_tables.rb

diff --git a/app/models/backup_draft_post.rb b/app/models/backup_draft_post.rb
new file mode 100644
index 0000000000..9dd552452b
--- /dev/null
+++ b/app/models/backup_draft_post.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class BackupDraftPost < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :post
+end
+
+# == Schema Information
+#
+# Table name: backup_draft_posts
+#
+#  id         :bigint           not null, primary key
+#  user_id    :integer          not null
+#  post_id    :integer          not null
+#  key        :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_backup_draft_posts_on_post_id          (post_id) UNIQUE
+#  index_backup_draft_posts_on_user_id_and_key  (user_id,key) UNIQUE
+#
diff --git a/app/models/backup_draft_topic.rb b/app/models/backup_draft_topic.rb
new file mode 100644
index 0000000000..c3fdfe1204
--- /dev/null
+++ b/app/models/backup_draft_topic.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class BackupDraftTopic < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :topic
+end
+
+# == Schema Information
+#
+# Table name: backup_draft_topics
+#
+#  id         :bigint           not null, primary key
+#  user_id    :integer          not null
+#  topic_id   :integer          not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_backup_draft_topics_on_topic_id  (topic_id) UNIQUE
+#  index_backup_draft_topics_on_user_id   (user_id) UNIQUE
+#
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 9905cbe1c5..287d25c263 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -6,6 +6,10 @@ class Draft < ActiveRecord::Base
   EXISTING_TOPIC ||= 'topic_'
 
   def self.set(user, key, sequence, data)
+    if SiteSetting.backup_drafts_to_pm_length > 0 && SiteSetting.backup_drafts_to_pm_length < data.length
+      backup_draft(user, key, sequence, data)
+    end
+
     if d = find_draft(user, key)
       return if d.sequence > sequence
 
@@ -96,6 +100,92 @@ class Draft < ActiveRecord::Base
     Draft.where("updated_at < ?", delete_drafts_older_than_n_days).destroy_all
   end
 
+  def self.backup_draft(user, key, sequence, data)
+    reply = JSON.parse(data)["reply"] || ""
+    return if reply.length < SiteSetting.backup_drafts_to_pm_length
+
+    post_id = BackupDraftPost.where(user_id: user.id, key: key).pluck(:post_id).first
+    post = Post.where(id: post_id).first if post_id
+
+    if post_id && !post
+      BackupDraftPost.where(user_id: user.id, key: key).delete_all
+    end
+
+    indented_reply = reply.split("\n").map! do |l|
+      "    #{l}"
+    end
+    draft_body = <<~MD
+      #{indented_reply.join("\n")}
+
+      ```text
+      seq: #{sequence}
+      key: #{key}
+      ```
+    MD
+
+    return if post && post.raw == draft_body
+
+    if !post
+      topic = ensure_draft_topic!(user)
+      Post.transaction do
+        post = PostCreator.new(
+          user,
+          raw: draft_body,
+          skip_jobs: true,
+          skip_validations: true,
+          topic_id: topic.id,
+        ).create
+        BackupDraftPost.create!(user_id: user.id, key: key, post_id: post.id)
+      end
+    elsif post.updated_at > 5.minutes.ago
+      # bypass all validations here to maximize speed
+      post.update_columns(
+        raw: draft_body,
+        cooked: PrettyText.cook(draft_body),
+        updated_at: Time.zone.now
+      )
+    else
+      revisor = PostRevisor.new(post, post.topic)
+      revisor.revise!(user, { raw: draft_body },
+        bypass_bump: true,
+        skip_validations: true,
+        skip_staff_log: true,
+        bypass_rate_limiter: true
+      )
+    end
+
+  rescue => e
+    Discourse.warn_exception(e, message: "Failed to backup draft")
+  end
+
+  def self.ensure_draft_topic!(user)
+    topic_id = BackupDraftTopic.where(user_id: user.id).pluck(:topic_id).first
+    topic = Topic.find_by(id: topic_id) if topic_id
+
+    if topic_id && !topic
+      BackupDraftTopic.where(user_id: user.id).delete_all
+    end
+
+    if !topic
+      Topic.transaction do
+        creator = PostCreator.new(
+          user,
+          title: I18n.t("draft_backup.pm_title"),
+          archetype: Archetype.private_message,
+          raw: I18n.t("draft_backup.pm_body"),
+          skip_jobs: true,
+          skip_validations: true,
+          target_usernames: user.username
+        )
+        topic = creator.create.topic
+        BackupDraftTopic.create!(topic_id: topic.id, user_id: user.id)
+      end
+    end
+
+    topic
+
+  end
+
 end
 
 # == Schema Information
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 1e72fbf09b..d88a01ccc1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -871,6 +871,9 @@ en:
       short_description: "Like this post"
       long_form: "liked this"
 
+  draft_backup:
+    pm_title: "Backup Drafts from ongoing topics"
+    pm_body: "Topic containing backup drafts"
   user_activity:
     no_default:
       self: "You have no activity yet."
@@ -1993,7 +1996,7 @@ en:
     notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a personal message to moderators. Set to 0 to disable."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
 
-    delete_drafts_older_than_n_days: Delete drafts older than (n) days.
+    delete_drafts_older_than_n_days: "Delete drafts older than (n) days."
 
     bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)"
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 603ac3cc89..c452320eac 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1858,6 +1858,10 @@ uncategorized:
   delete_drafts_older_than_n_days:
     default: 180
 
+  backup_drafts_to_pm_length:
+    default: 0
+    hidden: true
+
   tos_topic_id:
     default: -1
     hidden: true
diff --git a/db/migrate/20191017044811_add_draft_backup_tables.rb b/db/migrate/20191017044811_add_draft_backup_tables.rb
new file mode 100644
index 0000000000..6177426c50
--- /dev/null
+++ b/db/migrate/20191017044811_add_draft_backup_tables.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddDraftBackupTables < ActiveRecord::Migration[6.0]
+  def change
+
+    create_table :backup_draft_topics do |t|
+      t.integer :user_id, null: false
+      t.integer :topic_id, null: false
+      t.timestamps
+    end
+
+    create_table :backup_draft_posts do |t|
+      t.integer :user_id, null: false
+      t.integer :post_id, null: false
+      t.string :key, null: false
+      t.timestamps
+    end
+
+    add_index :backup_draft_posts, [:user_id, :key], unique: true
+    add_index :backup_draft_posts, [:post_id], unique: true
+
+    add_index :backup_draft_topics, [:user_id], unique: true
+    add_index :backup_draft_topics, [:topic_id], unique: true
+  end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index bf1fe848d7..561720dfb0 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -34,6 +34,7 @@ class PostCreator
   #                             dequeue before the commit finishes. If you do this, be sure to
   #                             call `enqueue_jobs` after the transaction is comitted.
   #   hidden_reason_id        - Reason for hiding the post (optional)
+  #   skip_validations        - Do not validate any of the content in the post
   #
   #   When replying to a topic:
   #     topic_id              - topic we're replying to
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 2cdf5fa5d4..b65c20c3b7 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -3,37 +3,70 @@
 require 'rails_helper'
 
 describe Draft do
-  before do
-    @user = Fabricate(:user)
+
+  fab!(:user) do
+    Fabricate(:user)
   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
+
+      draft = {
+        reply: "this is a reply",
+        random_key: "random"
+      }
+
+      Draft.set(user, "new_private_message", 0, draft.to_json)
+      draft["reply"] = "test" * 100
+      Draft.set(user, "new_private_message", 77, draft.to_json)
+
+      draft_post = BackupDraftPost.find_by(user_id: user.id, key: "new_private_message").post
+
+      expect(draft_post.revisions.count).to eq(0)
+
+      freeze_time 10.minutes.from_now
+
+      # this should trigger a post revision as 10 minutes have passed
+      draft["reply"] = "hello"
+      Draft.set(user, "new_private_message", 77, draft.to_json)
+
+      draft_topic = BackupDraftTopic.find_by(user_id: user.id)
+      expect(draft_topic.topic.posts_count).to eq(2)
+
+      draft_post.reload
+      expect(draft_post.revisions.count).to eq(1)
+    end
+  end
+
   it "can get a draft by user" do
-    Draft.set(@user, "test", 0, "data")
-    expect(Draft.get(@user, "test", 0)).to eq "data"
+    Draft.set(user, "test", 0, "data")
+    expect(Draft.get(user, "test", 0)).to eq "data"
   end
 
   it "uses the user id and key correctly" do
-    Draft.set(@user, "test", 0, "data")
+    Draft.set(user, "test", 0, "data")
     expect(Draft.get(Fabricate.build(:coding_horror), "test", 0)).to eq nil
   end
 
   it "should overwrite draft data correctly" do
-    Draft.set(@user, "test", 0, "data")
-    Draft.set(@user, "test", 0, "new data")
-    expect(Draft.get(@user, "test", 0)).to eq "new data"
+    Draft.set(user, "test", 0, "data")
+    Draft.set(user, "test", 0, "new data")
+    expect(Draft.get(user, "test", 0)).to eq "new data"
   end
 
   it "should clear drafts on request" do
-    Draft.set(@user, "test", 0, "data")
-    Draft.clear(@user, "test", 0)
-    expect(Draft.get(@user, "test", 0)).to eq nil
+    Draft.set(user, "test", 0, "data")
+    Draft.clear(user, "test", 0)
+    expect(Draft.get(user, "test", 0)).to eq nil
   end
 
   it "should disregard old draft if sequence decreases" do
-    Draft.set(@user, "test", 0, "data")
-    Draft.set(@user, "test", 1, "hello")
-    Draft.set(@user, "test", 0, "foo")
-    expect(Draft.get(@user, "test", 0)).to eq nil
-    expect(Draft.get(@user, "test", 1)).to eq "hello"
+    Draft.set(user, "test", 0, "data")
+    Draft.set(user, "test", 1, "hello")
+    Draft.set(user, "test", 0, "foo")
+    expect(Draft.get(user, "test", 0)).to eq nil
+    expect(Draft.get(user, "test", 1)).to eq "hello"
   end
 
   it 'can cleanup old drafts' do
@@ -71,25 +104,25 @@ describe Draft do
     let(:public_topic) { public_post.topic }
 
     let(:stream) do
-      Draft.stream(user: @user)
+      Draft.stream(user: user)
     end
 
     it "should include the correct number of drafts in the stream" do
-      Draft.set(@user, "test", 0, '{"reply":"hey.","action":"createTopic","title":"Hey"}')
-      Draft.set(@user, "test2", 0, '{"reply":"howdy"}')
+      Draft.set(user, "test", 0, '{"reply":"hey.","action":"createTopic","title":"Hey"}')
+      Draft.set(user, "test2", 0, '{"reply":"howdy"}')
       expect(stream.count).to eq(2)
     end
 
     it "should include the right topic id in a draft reply in the stream" do
-      Draft.set(@user, "topic_#{public_topic.id}", 0, '{"reply":"hi"}')
+      Draft.set(user, "topic_#{public_topic.id}", 0, '{"reply":"hi"}')
       draft_row = stream.first
       expect(draft_row.topic_id).to eq(public_topic.id)
     end
 
     it "should include the right draft username in the stream" do
-      Draft.set(@user, "topic_#{public_topic.id}", 0, '{"reply":"hey"}')
+      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.draft_username).to eq(user.username)
     end
 
   end

From 3314aa9f8883fc4f62e85d7ed2c4c1e6a3b0c7ad Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 17 Oct 2019 16:57:53 +1100
Subject: [PATCH 076/328] DEV: annotate models

Some comments were out of data, updated
---
 app/models/reviewable_score.rb  |  1 +
 app/models/topic_group.rb       | 12 +++++++-----
 app/models/user.rb              |  2 ++
 app/models/user_security_key.rb | 22 +++++++++++++++-------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/models/reviewable_score.rb b/app/models/reviewable_score.rb
index cbe561f355..1fd9d2d7eb 100644
--- a/app/models/reviewable_score.rb
+++ b/app/models/reviewable_score.rb
@@ -116,6 +116,7 @@ end
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #  reason                :string
+#  user_accuracy_bonus   :float            default(0.0), not null
 #
 # Indexes
 #
diff --git a/app/models/topic_group.rb b/app/models/topic_group.rb
index b69016a94e..a2c60e1f5f 100644
--- a/app/models/topic_group.rb
+++ b/app/models/topic_group.rb
@@ -60,12 +60,14 @@ end
 #
 # Table name: topic_groups
 #
-#  id                     :integer          not null, primary key
-#  group_id               :integer          not null
-#  topic_id               :integer          not null
-#  last_read_post_number  :integer          default(0), not null
+#  id                    :bigint           not null, primary key
+#  group_id              :integer          not null
+#  topic_id              :integer          not null
+#  last_read_post_number :integer          default(0), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #
 # Indexes
 #
-#  index_topic_allowed_groups_on_group_id_and_topic_id  (group_id,topic_id) UNIQUE
+#  index_topic_groups_on_group_id_and_topic_id  (group_id,topic_id) UNIQUE
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index af28a89a0e..7ed158b2a2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1563,6 +1563,7 @@ end
 #  silenced_till             :datetime
 #  group_locked_trust_level  :integer
 #  manual_locked_trust_level :integer
+#  secure_identifier         :string
 #
 # Indexes
 #
@@ -1570,6 +1571,7 @@ end
 #  idx_users_moderator                (id) WHERE moderator
 #  index_users_on_last_posted_at      (last_posted_at)
 #  index_users_on_last_seen_at        (last_seen_at)
+#  index_users_on_secure_identifier   (secure_identifier) UNIQUE
 #  index_users_on_uploaded_avatar_id  (uploaded_avatar_id)
 #  index_users_on_username            (username) UNIQUE
 #  index_users_on_username_lower      (username_lower) UNIQUE
diff --git a/app/models/user_security_key.rb b/app/models/user_security_key.rb
index 61f325bd0d..229dbbdf96 100644
--- a/app/models/user_security_key.rb
+++ b/app/models/user_security_key.rb
@@ -21,18 +21,26 @@ end
 # Table name: user_security_keys
 #
 #  id            :bigint           not null, primary key
-#  user_id       :integer          not null
-#  factor_type   :integer          not null
-#  credential_id :string           not null, UNIQUE
+#  user_id       :bigint           not null
+#  credential_id :string           not null
 #  public_key    :string           not null
-#  enabled       :boolean          default(FALSE), not null
+#  factor_type   :integer          default(0), not null
+#  enabled       :boolean          default(TRUE), not null
+#  name          :string           not null
 #  last_used     :datetime
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  name          :string           not null
 #
 # Indexes
 #
-#  index_user_security_keys_on_credential_id  (credential_id) (UNIQUE)
-#  index_user_security_keys_on_factor_type    (factor_type)
+#  index_user_security_keys_on_credential_id            (credential_id) UNIQUE
+#  index_user_security_keys_on_factor_type              (factor_type)
+#  index_user_security_keys_on_factor_type_and_enabled  (factor_type,enabled)
+#  index_user_security_keys_on_last_used                (last_used)
+#  index_user_security_keys_on_public_key               (public_key)
+#  index_user_security_keys_on_user_id                  (user_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (user_id => users.id)
 #

From cb0443792b10598e173c30221c90d87fc3a3acbd Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 17 Oct 2019 17:41:28 +1100
Subject: [PATCH 077/328] DEV: correct revision debouncer for backup draft

We were debouncing on update_at which we kept on pushing forward, this
was leading to not enough revisions.
---
 app/models/draft.rb       | 2 +-
 spec/models/draft_spec.rb | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/draft.rb b/app/models/draft.rb
index 287d25c263..f05cb8b7fe 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -137,7 +137,7 @@ class Draft < ActiveRecord::Base
         ).create
         BackupDraftPost.create!(user_id: user.id, key: key, post_id: post.id)
       end
-    elsif post.updated_at > 5.minutes.ago
+    elsif post.last_version_at > 5.minutes.ago
       # bypass all validations here to maximize speed
       post.update_columns(
         raw: draft_body,
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index b65c20c3b7..fff8b8d579 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -19,13 +19,17 @@ describe Draft do
 
       Draft.set(user, "new_private_message", 0, draft.to_json)
       draft["reply"] = "test" * 100
+
+      half_grace = (SiteSetting.editing_grace_period / 2 + 1).seconds
+
+      freeze_time half_grace.from_now
       Draft.set(user, "new_private_message", 77, draft.to_json)
 
       draft_post = BackupDraftPost.find_by(user_id: user.id, key: "new_private_message").post
 
       expect(draft_post.revisions.count).to eq(0)
 
-      freeze_time 10.minutes.from_now
+      freeze_time half_grace.from_now
 
       # this should trigger a post revision as 10 minutes have passed
       draft["reply"] = "hello"

From b6ef473a31d2b09764f6254c922a949c07303231 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 17 Oct 2019 09:18:07 +0200
Subject: [PATCH 078/328] DEV: prevents redefinition of various constants
 (#8199)

CLEANUP_GRACE_PERIOD
MAX_AWARDED
POLL_MAILBOX_TIMEOUT_ERROR_KEY
---
 app/jobs/scheduled/grant_new_user_of_the_month_badges.rb | 2 +-
 app/jobs/scheduled/poll_mailbox.rb                       | 2 +-
 app/jobs/scheduled/reindex_search.rb                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
index 59fb77bc94..531fc7cb84 100644
--- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -4,7 +4,7 @@ module Jobs
   class GrantNewUserOfTheMonthBadges < ::Jobs::Scheduled
     every 1.day
 
-    MAX_AWARDED = 2
+    MAX_AWARDED ||= 2
 
     def execute(args)
       badge = Badge.find(Badge::NewUserOfTheMonth)
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 2202899483..f382e8fc8a 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -23,7 +23,7 @@ module Jobs
       Email::Processor.process!(popmail.pop)
     end
 
-    POLL_MAILBOX_TIMEOUT_ERROR_KEY = "poll_mailbox_timeout_error_key".freeze
+    POLL_MAILBOX_TIMEOUT_ERROR_KEY ||= "poll_mailbox_timeout_error_key".freeze
 
     def poll_pop3
       pop3 = Net::POP3.new(SiteSetting.pop3_polling_host, SiteSetting.pop3_polling_port)
diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index 2ffb811094..c0eee8f5db 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -5,7 +5,7 @@ module Jobs
   class ReindexSearch < ::Jobs::Scheduled
     every 2.hours
 
-    CLEANUP_GRACE_PERIOD = 1.day.ago
+    CLEANUP_GRACE_PERIOD ||= 1.day.ago
 
     def execute(args)
       rebuild_problem_topics

From 815dcb25bae16dee53ee2b1107a581cd0d1a844e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 17 Oct 2019 10:54:04 +0100
Subject: [PATCH 079/328] UX: Improve new GitHub onebox rendering in emails

Unfortunately SVGs are not supported in most email clients, so remove them
---
 lib/email/styles.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 90ec15dd87..b3ee704103 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -58,6 +58,9 @@ module Email
     def format_basic
       uri = URI(Discourse.base_url)
 
+      # Remove SVGs
+      @fragment.css('svg, img[src$=".svg"]').remove
+
       # images
       @fragment.css('img').each do |img|
         next if img['class'] == 'site-logo'
@@ -120,10 +123,13 @@ module Email
       style('aside.onebox header img.site-icon', "width: 16px; height: 16px; margin-right: 3px;")
       style('aside.onebox header a[href]', "color: #222222; text-decoration: none;")
       style('aside.onebox .onebox-body', "clear: both")
-      style('aside.onebox .onebox-body img', "max-height: 80%; max-width: 20%; height: auto; float: left; margin-right: 10px;")
+      style('aside.onebox .onebox-body img:not(.onebox-avatar-inline)', "max-height: 80%; max-width: 20%; height: auto; float: left; margin-right: 10px;")
       style('aside.onebox .onebox-body img.thumbnail', "width: 60px;")
       style('aside.onebox .onebox-body h3, aside.onebox .onebox-body h4', "font-size: 1.17em; margin: 10px 0;")
       style('.onebox-metadata', "color: #919191")
+      style('.github-info', "margin-top: 10px;")
+      style('.github-info div', "display: inline; margin-right: 10px;")
+      style('.onebox-avatar-inline', "float: none; vertical-align: middle;")
 
       @fragment.css('aside.quote blockquote > p').each do |p|
         p['style'] = 'padding: 0;'

From ecfba0bb37fde6eeb0b57d54a7655283941c899a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 17 Oct 2019 11:00:44 +0100
Subject: [PATCH 080/328] UX: Ensure GitHub onebox info does not wrap
 unnecessarily

---
 app/assets/stylesheets/common/base/onebox.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index b735363b85..e44e7d2d7f 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -417,10 +417,15 @@ pre.onebox code {
     }
   }
 
+  .github-info-container {
+    width: 100%;
+  }
+
   .github-info {
     display: flex;
     align-items: center;
     flex-wrap: wrap;
+    width: 100%;
 
     > div {
       margin: 2.5px 0;

From 54bc2bdba78e8d1a602f564a8a2acab202cb8940 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 17 Oct 2019 16:18:06 +0200
Subject: [PATCH 081/328] UX: emphasizes on local-dates being UTC in excerpts
 (#8208)

---
 plugins/discourse-local-dates/plugin.rb                  | 6 ++++++
 .../discourse-local-dates/spec/lib/pretty_text_spec.rb   | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
index 2adf23dca0..5ee9fefad7 100644
--- a/plugins/discourse-local-dates/plugin.rb
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -53,6 +53,12 @@ after_initialize do
     custom_fields[DiscourseLocalDates::POST_CUSTOM_FIELD] || []
   end
 
+  on(:reduce_excerpt) do |fragment, post|
+    fragment.css('.discourse-local-date').each do |container|
+      container.content = "#{container.content} (UTC)"
+    end
+  end
+
   on(:reduce_cooked) do |fragment|
     fragment.css('.discourse-local-date').each do |container|
       if container.attributes['data-email-preview']
diff --git a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
index 476dd54f3d..6a1a4ec76f 100644
--- a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
+++ b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
@@ -71,4 +71,13 @@ describe PrettyText do
       end
     end
   end
+
+  context 'excerpt simplified rendering' do
+    let(:post) { Fabricate(:post, raw: '[date=2019-10-16 time=14:00:00 format="LLLL" timezone="America/New_York"]') }
+
+    it 'adds UTC' do
+      excerpt = PrettyText.excerpt(post.cooked, 200)
+      expect(excerpt).to eq("Wednesday, October 16, 2019 6:00 PM (UTC)")
+    end
+  end
 end

From 11a9e0fc702ea3db3b210c83e642f561986b3eed Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 17 Oct 2019 15:46:12 +0100
Subject: [PATCH 082/328] DEV: Add test for creating user with custom fields
 and user fields

---
 spec/requests/users_controller_spec.rb | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 40bc5322eb..bce87943f5 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1819,6 +1819,33 @@ describe UsersController do
               expect(user.user_fields[user_field.id.to_s]).to eq('happy')
             end
 
+            it "works alongside a user field during creation" do
+              api_key = Fabricate(:api_key, user: Fabricate(:admin))
+              user_field = Fabricate(:user_field, editable: true)
+              post "/u.json", params: {
+                name: "Test User",
+                username: "testuser",
+                email: "user@mail.com",
+                password: 'supersecure',
+                active: true,
+                custom_fields: {
+                  test2: 'custom field value'
+                },
+                user_fields: {
+                  user_field.id.to_s => 'user field value'
+                },
+                api_key: api_key.key
+              }
+              expect(response.status).to eq(200)
+              u = User.find_by_email('user@mail.com')
+
+              val = u.custom_fields["user_field_#{user_field.id}"]
+              expect(val).to eq('user field value')
+
+              val = u.custom_fields["test2"]
+              expect(val).to eq('custom field value')
+            end
+
             it "is secure when there are no registered editable fields" do
               User.plugin_editable_user_custom_fields.clear
               User.plugin_staff_editable_user_custom_fields.clear

From bd969332e0b4914809e824450d565483e6d69f75 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Thu, 17 Oct 2019 11:34:07 -0500
Subject: [PATCH 083/328] FIX: Display site text overrides for non '_MF' keys
 (#8189)

FIX: Transform pluralized keys to `.other`, to check valid interpolation
---
 .../components/expanding-text-area.js.es6     |  1 +
 .../admin/site_texts_controller.rb            |  2 +-
 app/models/translation_override.rb            | 10 ++++--
 spec/models/translation_override_spec.rb      | 35 +++++++++++++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

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 064764713f..7008eb1d01 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -12,6 +12,7 @@ export default Ember.TextArea.extend({
 
   @observes("value")
   _updateAutosize() {
+    this.element.value = this.value;
     const evt = document.createEvent("Event");
     evt.initEvent("autosize:update", true, false);
     this.element.dispatchEvent(evt);
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 756974c109..ef594471d9 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -109,7 +109,7 @@ class Admin::SiteTextsController < Admin::AdminController
       value = override&.first
     end
 
-    value ||= I18n.t(key, default: '')
+    value ||= I18n.t(key)
     { id: key, value: value }
   end
 
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 9dcf718919..95e4183589 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -65,8 +65,10 @@ class TranslationOverride < ActiveRecord::Base
   private
 
   def check_interpolation_keys
+    transformed_key = transform_pluralized_key(translation_key)
+
     original_text = I18n.overrides_disabled do
-      I18n.t(translation_key, locale: :en)
+      I18n.t(transformed_key, locale: :en)
     end
 
     if original_text
@@ -76,7 +78,7 @@ class TranslationOverride < ActiveRecord::Base
       custom_interpolation_keys = []
 
       CUSTOM_INTERPOLATION_KEYS_WHITELIST.select do |key, value|
-        if self.translation_key.start_with?(key)
+        if transformed_key.start_with?(key)
           custom_interpolation_keys = value
         end
       end
@@ -96,6 +98,10 @@ class TranslationOverride < ActiveRecord::Base
     end
   end
 
+  def transform_pluralized_key(key)
+    match = key.match(/(.*)\.(zero|two|few|many)$/)
+    match ? match.to_a.second + '.other' : key
+  end
 end
 
 # == Schema Information
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index cbbf1d8a87..bdb61989bf 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -7,6 +7,7 @@ describe TranslationOverride do
     describe '#value' do
       before do
         I18n.backend.store_translations(I18n.locale, some_key: '%{first} %{second}')
+        I18n.backend.store_translations(:en, something: { one: '%{key1} %{key2}', other: '%{key3} %{key4}' })
       end
 
       describe 'when interpolation keys are missing' do
@@ -36,6 +37,40 @@ describe TranslationOverride do
           end
         end
       end
+
+      describe 'pluralized keys' do
+        describe 'valid keys' do
+          it 'converts zero to other' do
+            translation_override = TranslationOverride.upsert!(I18n.locale, 'something.zero', '%{key3} %{key4} hello')
+            expect(translation_override.errors.full_messages).to eq([])
+          end
+
+          it 'converts two to other' do
+            translation_override = TranslationOverride.upsert!(I18n.locale, 'something.two', '%{key3} %{key4} hello')
+            expect(translation_override.errors.full_messages).to eq([])
+          end
+
+          it 'converts few to other' do
+            translation_override = TranslationOverride.upsert!(I18n.locale, 'something.few', '%{key3} %{key4} hello')
+            expect(translation_override.errors.full_messages).to eq([])
+          end
+
+          it 'converts many to other' do
+            translation_override = TranslationOverride.upsert!(I18n.locale, 'something.many', '%{key3} %{key4} hello')
+            expect(translation_override.errors.full_messages).to eq([])
+          end
+        end
+
+        describe 'invalid keys' do
+          it "does not transform 'tonz'" do
+            translation_override = TranslationOverride.upsert!(I18n.locale, 'something.tonz', '%{key3} %{key4} hello')
+            expect(translation_override.errors.full_messages).to include(I18n.t(
+              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+              keys: 'key3, key4'
+            ))
+          end
+        end
+      end
     end
   end
 

From 3cdcd093ee428c8e28150ab0e33e5cec5a432c14 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 17 Oct 2019 22:05:44 +0530
Subject: [PATCH 084/328] REFACTOR: improve the code readability. (#8211)

b2f682f35eba0cc3f09588356ecf8d1dd824542f
---
 .../admin/components/site-setting.js.es6      | 25 ++++++-------------
 .../admin/mixins/setting-component.js.es6     |  2 +-
 .../modal/site-setting-default-categories.hbs |  4 +--
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 4c1d76cad8..e94713f476 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -5,14 +5,6 @@ import showModal from "discourse/lib/show-modal";
 import AboutRoute from "discourse/routes/about";
 
 export default Ember.Component.extend(BufferedContent, SettingComponent, {
-  update(key, value, updateExistingUsers = false) {
-    if (updateExistingUsers) {
-      return SiteSetting.update(key, value, { updateExistingUsers: true });
-    } else {
-      return SiteSetting.update(key, value);
-    }
-  },
-
   _save(callback) {
     const defaultCategoriesSettings = [
       "default_categories_watching",
@@ -36,19 +28,16 @@ export default Ember.Component.extend(BufferedContent, SettingComponent, {
             admin: true
           });
 
-          controller.setProperties({
-            onClose: () => {
-              const updateExistingUsers = controller.get("updateExistingUsers");
-              if (updateExistingUsers === true) {
-                callback(this.update(key, value, true));
-              } else if (updateExistingUsers === false) {
-                callback(this.update(key, value));
-              }
-            }
+          controller.set("onClose", () => {
+            callback(
+              SiteSetting.update(key, value, {
+                updateExistingUsers: controller.updateExistingUsers
+              })
+            );
           });
         });
     } else {
-      callback(this.update(key, value));
+      callback(SiteSetting.update(key, value));
     }
   }
 });
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index a2d5b3a4de..397817d793 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -116,7 +116,7 @@ export default Ember.Mixin.create({
           .then(() => {
             this.set("validationMessage", null);
             this.commitBuffer();
-            if (AUTO_REFRESH_ON_SAVE.includes(this.get("setting.setting"))) {
+            if (AUTO_REFRESH_ON_SAVE.includes(this.setting.setting)) {
               this.afterSave();
             }
           })
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 e56bf01c65..0bd05c2ba8 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 btn-primary' label='admin.site_settings.default_categories.modal_yes'}}
-  {{d-button action=(action "cancel") class='btn' 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>

From 2304dcf993f626c86b0cab43d33dc7005e850fb9 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 17 Oct 2019 13:38:31 -0300
Subject: [PATCH 085/328] FIX: Do not truncate encoded slugs

Trying to truncate encoded slugs will mean that we have to keep the URL
valid, which can be tricky as you have to be aware of multibyte
characters.

Since we already have upper bounds for the title, the slug won't grow
for more than title*6 in the worst case. The slug column in the topic
table can store that just fine.

Added a test to ensure that a generated slug is a valid URL too, so we
don't introduce regressions in the future.
---
 lib/slug.rb                  | 4 ++++
 spec/components/slug_spec.rb | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/lib/slug.rb b/lib/slug.rb
index 8436f74ebc..f50492bddf 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -9,6 +9,10 @@ module Slug
   def self.for(string, default = 'topic', max_length = MAX_LENGTH)
     string = string.gsub(/:([\w\-+]+(?::t\d)?):/, '') if string.present? # strip emoji strings
 
+    if SiteSetting.slug_generation_method == 'encoded'
+      max_length = 9999 # do not truncate encoded slugs
+    end
+
     slug =
       case (SiteSetting.slug_generation_method || :ascii).to_sym
       when :ascii then self.ascii_generator(string)
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index dba8bcb6f5..699d3e0c6b 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -81,6 +81,11 @@ describe Slug do
       it "kills the trailing dash" do
         expect(Slug.for("2- -this!~-_|,we-#-=^-")).to eq('2-this-we')
       end
+
+      it "returns a slug that can be used in a valid URL" do
+        slug = Slug.for("Γνωμη για αγορα μπουζουκιου μεσω ιντερνετ και εκτίμηση")
+        expect { URI.parse("http://example.com/#{slug}") }.not_to raise_error
+      end
     end
 
     context 'none generator' do

From d1b86352d4422a48a8b41b3d10f4c873e7069458 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 17 Oct 2019 18:05:42 +0100
Subject: [PATCH 086/328] UX: Make group membership UI clearer (#8210)

The 'automatically set primary group' checkbox looked like it was associated with the email membership. In fact, it applies to all members who join the group. This commit moves it next to the 'automatic trust level' setting, and puts them both under an 'Effects' heading
---
 .../groups-form-membership-fields.hbs         | 27 ++++++++++---------
 .../groups-form-membership-fields.scss        |  3 ++-
 config/locales/client.en.yml                  |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

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 f2c6ca7593..757c14c40a 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
@@ -17,6 +17,20 @@
 
       {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}}
     </label>
+  </div>
+
+  {{plugin-outlet name="groups-form-membership-below-automatic"
+                  args=(hash model=model)}}
+
+  <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>
+
+    {{combo-box name="grant_trust_level"
+        valueAttribute="value"
+        value=model.grant_trust_level
+        content=trustLevelOptions
+        class="groups-form-grant-trust-level"}}
 
     <label>
       {{input type="checkbox"
@@ -25,20 +39,7 @@
 
       {{i18n 'admin.groups.manage.membership.primary_group'}}
     </label>
-  </div>
 
-  {{plugin-outlet name="groups-form-membership-below-automatic"
-                  args=(hash model=model)}}
-
-  <div class="control-group">
-    <label class="control-label">{{i18n "admin.groups.manage.membership.trust_level"}}</label>
-    <label for="grant_trust_level">{{i18n 'admin.groups.manage.membership.trust_levels_title'}}</label>
-
-    {{combo-box name="grant_trust_level"
-        valueAttribute="value"
-        value=model.grant_trust_level
-        content=trustLevelOptions
-        class="groups-form-grant-trust-level"}}
   </div>
 {{/if}}
 
diff --git a/app/assets/stylesheets/common/components/groups-form-membership-fields.scss b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
index d47b250696..fa2918196b 100644
--- a/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
+++ b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
@@ -1,3 +1,4 @@
-.group-form-automatic-membership-automatic {
+.group-form-automatic-membership-automatic,
+.groups-form-grant-trust-level {
   margin-bottom: 10px;
 }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c12494cc5b..cdc458f4a0 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3268,8 +3268,8 @@ en:
 
           membership:
             automatic: Automatic
-            trust_level: Trust Level
             trust_levels_title: "Trust level automatically granted to members when they're added:"
+            effects: Effects
             trust_levels_none: "None"
             automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
             automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"

From 85140aa09a15303703da8a08e63a73e71d61fc2e Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 17 Oct 2019 15:08:43 -0400
Subject: [PATCH 087/328] UX: dashboard links to git commits list instead of
 git comparison

Previously the link went to a comparison of the installed commit with
the tests-passed branch. This change will show the list of installed
commits.
---
 .../javascripts/admin/models/version-check.js.es6      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/models/version-check.js.es6 b/app/assets/javascripts/admin/models/version-check.js.es6
index ce41d66713..2012d0ff08 100644
--- a/app/assets/javascripts/admin/models/version-check.js.es6
+++ b/app/assets/javascripts/admin/models/version-check.js.es6
@@ -17,12 +17,10 @@ const VersionCheck = Discourse.Model.extend({
     return missingVersionsCount === 1;
   },
 
-  @computed("git_branch", "installed_sha")
-  gitLink(gitBranch, installedSHA) {
-    if (gitBranch && installedSHA) {
-      return `https://github.com/discourse/discourse/compare/${installedSHA}...${gitBranch}`;
-    } else if (installedSHA) {
-      return `https://github.com/discourse/discourse/tree/${installedSHA}`;
+  @computed("installed_sha")
+  gitLink(installedSHA) {
+    if (installedSHA) {
+      return `https://github.com/discourse/discourse/commits/${installedSHA}`;
     }
   },
 

From f97b6e85daac2c872a710748dfe004aabb3cff72 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 17 Oct 2019 17:02:17 -0300
Subject: [PATCH 088/328] FIX: Handle encoded slugs for subcategories

---
 app/assets/javascripts/discourse/models/category.js.es6 | 8 +++++++-
 app/models/category.rb                                  | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 11bdbf9b8a..665961e03d 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -283,7 +283,13 @@ Category.reopenClass({
           return (
             item &&
             item.get("parentCategory") === parentCategory &&
-            Category.slugFor(item) === parentSlug + "/" + slug
+            (
+              Discourse.SiteSettings.slug_generation_method !== "encoded" &&
+              Category.slugFor(item) === parentSlug + "/" + slug
+              ||
+              Discourse.SiteSettings.slug_generation_method === "encoded" &&
+              Category.slugFor(item) === encodeURI(parentSlug) + "/" + encodeURI(slug)
+            )
           );
         });
       }
diff --git a/app/models/category.rb b/app/models/category.rb
index e76089baad..d3273ea63d 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -607,7 +607,8 @@ class Category < ActiveRecord::Base
   end
 
   def self.query_parent_category(parent_slug)
-    self.where(slug: parent_slug, parent_category_id: nil).pluck(:id).first ||
+    encoded_parent_slug = CGI.escape(parent_slug) if SiteSetting.slug_generation_method == 'encoded'
+    self.where(slug: (encoded_parent_slug || parent_slug), parent_category_id: nil).pluck(:id).first ||
     self.where(id: parent_slug.to_i).pluck(:id).first
   end
 

From 1f6f118e52728a87cba4a1b459ee83dd09f2b3b2 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Thu, 17 Oct 2019 20:05:02 +0000
Subject: [PATCH 089/328] DEV: Bump Logster version to 2.4.1

This version includes a few performance fixes, details here: https://github.com/discourse/logster/commit/59f8cb0abff772b985986c421568650d26926d66
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d54d718a12..f58c26a167 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.3.3)
+    logster (2.4.1)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

From 42c2068ada7bbb3aecf3243eaedf08f61e3fdee0 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 17 Oct 2019 17:39:44 -0300
Subject: [PATCH 090/328] DEV: fix prettier offense

---
 .../javascripts/discourse/models/category.js.es6     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 665961e03d..8aa1f1e2c7 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -283,13 +283,11 @@ Category.reopenClass({
           return (
             item &&
             item.get("parentCategory") === parentCategory &&
-            (
-              Discourse.SiteSettings.slug_generation_method !== "encoded" &&
-              Category.slugFor(item) === parentSlug + "/" + slug
-              ||
-              Discourse.SiteSettings.slug_generation_method === "encoded" &&
-              Category.slugFor(item) === encodeURI(parentSlug) + "/" + encodeURI(slug)
-            )
+            ((Discourse.SiteSettings.slug_generation_method !== "encoded" &&
+              Category.slugFor(item) === parentSlug + "/" + slug) ||
+              (Discourse.SiteSettings.slug_generation_method === "encoded" &&
+                Category.slugFor(item) ===
+                  encodeURI(parentSlug) + "/" + encodeURI(slug)))
           );
         });
       }

From 80d8830c1788aa672ae9347422a6545eca60dc7e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 17 Oct 2019 15:22:27 -0600
Subject: [PATCH 091/328] DEV: Make max_tags_in_filter_list available
 clientside

This will allow plugins that use this setting to read the value using
javascript.
---
 config/site_settings.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index c452320eac..d4ca816af7 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2093,6 +2093,7 @@ tags:
     default: false
     refresh: true
   max_tags_in_filter_list:
+    client: true
     default: 30
     min: 1
     refresh: true

From f6ea986aecc48221878401a232e905f6772ae037 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 18 Oct 2019 01:49:26 +0200
Subject: [PATCH 092/328] DEV: Remove `suspend` from Admin::UsersController
 responses (#8206)

`suspend` isn't a User attribute, but was being assigned to the frontend User model as if it was. The model has a computed property that depends on `suspended_till`, so instead of overriding this property, it's better to return relevant attributes.

Fixes a computed-property.override deprecation (https://emberjs.com/deprecations/v3.x#toc_computed-property-override)
---
 app/controllers/admin/users_controller.rb                  | 4 ++--
 test/javascripts/acceptance/admin-suspend-user-test.js.es6 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 8c860a4d89..3261e8149a 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -137,7 +137,6 @@ class Admin::UsersController < Admin::AdminController
 
     render_json_dump(
       suspension: {
-        suspended: true,
         suspend_reason: params[:reason],
         full_suspend_reason: user_history.try(:details),
         suspended_till: @user.suspended_till,
@@ -157,7 +156,8 @@ class Admin::UsersController < Admin::AdminController
 
     render_json_dump(
       suspension: {
-        suspended: false
+        suspended_till: nil,
+        suspended_at: nil
       }
     )
   end
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index 152b035b60..d9983848ca 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -8,7 +8,7 @@ acceptance("Admin - Suspend User", {
     server.put("/admin/users/:user_id/suspend", () =>
       helper.response(200, {
         suspension: {
-          suspended: true
+          suspended_till: "2099-01-01T12:00:00.000Z"
         }
       })
     );
@@ -16,7 +16,7 @@ acceptance("Admin - Suspend User", {
     server.put("/admin/users/:user_id/unsuspend", () =>
       helper.response(200, {
         suspension: {
-          suspended: false
+          suspended_till: null
         }
       })
     );

From 7de3e7b3224f7ec8a6bccccccfb0f46ca02c53fc Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 18 Oct 2019 01:49:41 +0200
Subject: [PATCH 093/328] DEV: Fix the `Function.prototype.on` deprecation
 (#8205)

https://deprecations.emberjs.com/v3.x/#toc_function-prototype-extensions-on
---
 .../javascripts/admin/components/ace-editor.js.es6   |  4 ++--
 .../admin/mixins/setting-component.js.es6            |  8 ++++----
 .../discourse/components/backup-uploader.js.es6      |  4 ++--
 .../discourse/components/csv-uploader.js.es6         |  4 ++--
 .../discourse/components/signup-cta.js.es6           |  4 ++--
 .../discourse/components/topic-list-item.js.es6      |  4 ++--
 .../discourse/components/topic-list.js.es6           |  4 ++--
 .../discourse/components/user-stream.js.es6          | 12 ++++++------
 .../javascripts/discourse/mixins/cleans-up.js.es6    |  8 ++++----
 .../javascripts/discourse/mixins/upload.js.es6       |  8 ++++----
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index 8fd9089b2e..887b99d368 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -48,7 +48,7 @@ export default Ember.Component.extend({
     }
   },
 
-  _destroyEditor: function() {
+  _destroyEditor: Ember.on("willDestroyElement", function() {
     if (this._editor) {
       this._editor.destroy();
       this._editor = null;
@@ -59,7 +59,7 @@ export default Ember.Component.extend({
     }
 
     $(window).off("ace:resize");
-  }.on("willDestroyElement"),
+  }),
 
   resize() {
     if (this._editor) {
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 397817d793..97873a2bd8 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -89,18 +89,18 @@ export default Ember.Mixin.create({
     return settingDefault !== bufferedValue;
   },
 
-  _watchEnterKey: function() {
+  _watchEnterKey: Ember.on("didInsertElement", function() {
     $(this.element).on("keydown.setting-enter", ".input-setting-string", e => {
       if (e.keyCode === 13) {
         // enter key
         this.send("save");
       }
     });
-  }.on("didInsertElement"),
+  }),
 
-  _removeBindings: function() {
+  _removeBindings: Ember.on("willDestroyElement", function() {
     $(this.element).off("keydown.setting-enter");
-  }.on("willDestroyElement"),
+  }),
 
   _save() {
     Ember.warn("You should define a `_save` method", {
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
index 66b2665095..1fe3565aa3 100644
--- a/app/assets/javascripts/discourse/components/backup-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
@@ -34,7 +34,7 @@ export default Ember.Component.extend(UploadMixin, {
     };
   },
 
-  _init: function() {
+  _init: Ember.on("didInsertElement", function() {
     const $upload = $(this.element);
 
     $upload.on("fileuploadadd", (e, data) => {
@@ -47,5 +47,5 @@ export default Ember.Component.extend(UploadMixin, {
         })
         .catch(popupAjaxError);
     });
-  }.on("didInsertElement")
+  })
 });
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index a37e10f3cc..8178fdc09e 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -31,7 +31,7 @@ export default Ember.Component.extend(UploadMixin, {
     return { autoUpload: false };
   },
 
-  _init: function() {
+  _init: Ember.on("didInsertElement", function() {
     const $upload = $(this.element);
 
     $upload.on("fileuploadadd", (e, data) => {
@@ -42,5 +42,5 @@ export default Ember.Component.extend(UploadMixin, {
         result => (result ? data.submit() : data.abort())
       );
     });
-  }.on("didInsertElement")
+  })
 });
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index dbbc7ad1d5..287e30c651 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -16,9 +16,9 @@ export default Ember.Component.extend({
     }
   },
 
-  _turnOffIfHidden: function() {
+  _turnOffIfHidden: Ember.on("willDestroyElement", function() {
     if (this.session.get("hideSignupCta")) {
       this.session.set("showSignupCta", false);
     }
-  }.on("willDestroyElement")
+  })
 });
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 1116d97e61..ad822dfb42 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -202,7 +202,7 @@ export const ListItemDefaults = {
     $topic.on("animationend", () => $topic.removeClass("highlighted"));
   },
 
-  _highlightIfNeeded: function() {
+  _highlightIfNeeded: Ember.on("didInsertElement", function() {
     // highlight the last topic viewed
     if (this.session.get("lastTopicIdViewed") === this.get("topic.id")) {
       this.session.set("lastTopicIdViewed", null);
@@ -212,7 +212,7 @@ export const ListItemDefaults = {
       this.set("topic.highlight", false);
       this.highlight();
     }
-  }.on("didInsertElement")
+  })
 };
 
 export default Ember.Component.extend(
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 44846d5b0d..294563feaa 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -12,12 +12,12 @@ export default Ember.Component.extend({
   // Overwrite this to perform client side filtering of topics, if desired
   filteredTopics: Ember.computed.alias("topics"),
 
-  _init: function() {
+  _init: Ember.on("init", function() {
     this.addObserver("hideCategory", this.rerender);
     this.addObserver("order", this.rerender);
     this.addObserver("ascending", this.rerender);
     this.refreshLastVisited();
-  }.on("init"),
+  }),
 
   @computed("bulkSelectEnabled")
   toggleInTitle(bulkSelectEnabled) {
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index 7054358457..ffb5c68603 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -7,7 +7,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend(LoadMore, {
-  _initialize: function() {
+  _initialize: Ember.on("init", function() {
     const filter = this.get("stream.filter");
     if (filter) {
       this.set("classNames", [
@@ -15,7 +15,7 @@ export default Ember.Component.extend(LoadMore, {
         "filter-" + filter.toString().replace(",", "-")
       ]);
     }
-  }.on("init"),
+  }),
 
   loading: false,
   eyelineSelector: ".user-stream .item",
@@ -25,7 +25,7 @@ export default Ember.Component.extend(LoadMore, {
     Ember.run.schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
-  _inserted: function() {
+  _inserted: Ember.on("didInsertElement", function() {
     this.bindScrolling({ name: "user-stream-view" });
 
     $(window).on("resize.discourse-on-scroll", () => this.scrolled());
@@ -38,17 +38,17 @@ export default Ember.Component.extend(LoadMore, {
     $(this.element).on("click.discourse-redirect", ".excerpt a", function(e) {
       return ClickTrack.trackClick(e);
     });
-  }.on("didInsertElement"),
+  }),
 
   // This view is being removed. Shut down operations
-  _destroyed: function() {
+  _destroyed: Ember.on("willDestroyElement", function() {
     this.unbindScrolling("user-stream-view");
     $(window).unbind("resize.discourse-on-scroll");
     $(this.element).off("click.details-disabled", "details.disabled");
 
     // Unbind link tracking
     $(this.element).off("click.discourse-redirect", ".excerpt a");
-  }.on("willDestroyElement"),
+  }),
 
   actions: {
     removeBookmark(userAction) {
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
index 09d469af1c..8392aacf27 100644
--- a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
+++ b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
@@ -1,11 +1,11 @@
 // Include this mixin if you want to be notified when the dom should be
 // cleaned (usually on route change.)
 export default Ember.Mixin.create({
-  _initializeChooser: function() {
+  _initializeChooser: Ember.on("didInsertElement", function() {
     this.appEvents.on("dom:clean", this, "cleanUp");
-  }.on("didInsertElement"),
+  }),
 
-  _clearChooser: function() {
+  _clearChooser: Ember.on("willDestroyElement", function() {
     this.appEvents.off("dom:clean", this, "cleanUp");
-  }.on("willDestroyElement")
+  })
 });
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index d3f83ff419..d12a1ef00a 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -33,7 +33,7 @@ export default Ember.Mixin.create({
     return {};
   },
 
-  _initialize: function() {
+  _initialize: Ember.on("didInsertElement", function() {
     const $upload = $(this.element);
     const reset = () =>
       this.setProperties({ uploading: false, uploadProgress: 0 });
@@ -101,9 +101,9 @@ export default Ember.Mixin.create({
       }
       reset();
     });
-  }.on("didInsertElement"),
+  }),
 
-  _destroy: function() {
+  _destroy: Ember.on("willDestroyElement", function() {
     this.messageBus && this.messageBus.unsubscribe("/uploads/" + this.type);
 
     const $upload = $(this.element);
@@ -113,5 +113,5 @@ export default Ember.Mixin.create({
       /* wasn't initialized yet */
     }
     $upload.off();
-  }.on("willDestroyElement")
+  })
 });

From ac06c87b43505a0dd8f09da99e25cab5595abd99 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 18 Oct 2019 02:17:05 +0200
Subject: [PATCH 094/328] DEV: Remove badge-select-controller (#8207)

* DEV: Remove badge-select-controller

1. The `selectableUserBadges` computed property of `badge-title` was being incorrectly overwritten, which triggered computed-property.override deprecation.

2. The `badge-select-controller` mixin contained properties that were used either by `badge-title` component or `badges/show` controller, but none were being used by both. This change moves properties where they belong, and removes the mixin.

* Update app/assets/javascripts/discourse/controllers/badges/show.js.es6

Co-Authored-By: Robin Ward <robin.ward@gmail.com>

* Improve code brevity
---
 .../discourse/components/badge-title.js.es6   | 14 ++++++-
 .../discourse/controllers/badges/show.js.es6  | 14 ++++++-
 .../mixins/badge-select-controller.js.es6     | 39 -------------------
 .../templates/components/badge-title.hbs      |  2 +-
 4 files changed, 25 insertions(+), 44 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6

diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js.es6
index 117b1cc490..10a7088bd1 100644
--- a/app/assets/javascripts/discourse/components/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-title.js.es6
@@ -1,12 +1,22 @@
 import { ajax } from "discourse/lib/ajax";
-import BadgeSelectController from "discourse/mixins/badge-select-controller";
+import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend(BadgeSelectController, {
+export default Ember.Component.extend({
   classNames: ["badge-title"],
 
   saved: false,
   saving: false,
 
+  @computed("saving")
+  savingStatus(saving) {
+    return saving ? I18n.t("saving") : I18n.t("save");
+  },
+
+  @computed("selectableUserBadges", "selectedUserBadgeId")
+  selectedUserBadge(selectableUserBadges, selectedUserBadgeId) {
+    return selectableUserBadges.findBy("id", parseInt(selectedUserBadgeId));
+  },
+
   actions: {
     save() {
       this.setProperties({ saved: false, saving: true });
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index d3411ae6d3..def520016e 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,11 +1,11 @@
+import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
-import BadgeSelectController from "discourse/mixins/badge-select-controller";
 
-export default Ember.Controller.extend(BadgeSelectController, {
+export default Ember.Controller.extend({
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,
@@ -17,6 +17,16 @@ export default Ember.Controller.extend(BadgeSelectController, {
     return userBadgesAll.filterBy("badge.allow_title", true);
   },
 
+  @computed("filteredList")
+  selectableUserBadges(filteredList) {
+    return [
+      Ember.Object.create({
+        badge: Badge.create({ name: I18n.t("badges.none") })
+      }),
+      ...filteredList.uniqBy("badge.name")
+    ];
+  },
+
   @computed("username")
   user(username) {
     if (username) {
diff --git a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6 b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
deleted file mode 100644
index 449030dad2..0000000000
--- a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
+++ /dev/null
@@ -1,39 +0,0 @@
-import Badge from "discourse/models/badge";
-import computed from "ember-addons/ember-computed-decorators";
-
-export default Ember.Mixin.create({
-  saving: false,
-  saved: false,
-
-  @computed("filteredList")
-  selectableUserBadges(items) {
-    items = _.uniq(items, false, function(e) {
-      return e.get("badge.name");
-    });
-    items.unshiftObject(
-      Ember.Object.create({
-        badge: Badge.create({ name: I18n.t("badges.none") })
-      })
-    );
-    return items;
-  },
-
-  @computed("saving")
-  savingStatus(saving) {
-    return saving ? I18n.t("saving") : I18n.t("save");
-  },
-
-  @computed("selectedUserBadgeId")
-  selectedUserBadge(selectedUserBadgeId) {
-    selectedUserBadgeId = parseInt(selectedUserBadgeId);
-    let selectedUserBadge = null;
-    this.selectableUserBadges.forEach(function(userBadge) {
-      if (userBadge.get("id") === selectedUserBadgeId) {
-        selectedUserBadge = userBadge;
-      }
-    });
-    return selectedUserBadge;
-  },
-
-  disableSave: Ember.computed.alias("saving")
-});
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index 23b1f4e22d..14c3ee8b6c 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -18,7 +18,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <button class="btn btn-primary" disabled={{disableSave}} {{action "save"}}> {{savingStatus}} </button>
+        <button class="btn btn-primary" disabled={{saving}} {{action "save"}}> {{savingStatus}} </button>
         {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>

From 2fa380892836a0f650905ae70235358e82ac26de Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 18 Oct 2019 12:27:51 +0200
Subject: [PATCH 095/328] FIX: polyfills forEach support on NodeList for IE11
 (#8213)

---
 app/assets/javascripts/polyfills.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
index 49cc9bef30..9d2b88d162 100644
--- a/app/assets/javascripts/polyfills.js
+++ b/app/assets/javascripts/polyfills.js
@@ -356,4 +356,14 @@ if (!String.prototype.repeat) {
   };
 }
 
+// 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);
+    }
+  };
+}
+
 /* eslint-enable */

From 95114f87ae3f93e0e2234b1298c6280975b63d6e Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Fri, 18 Oct 2019 09:31:15 -0700
Subject: [PATCH 096/328] Improve spam_hosts copy (#8203)

- Increase size of the reviewable's conversation excerpt to prevent truncation of the new copy
- Remove the `domain` parameter from the `flag_linked_posts_as_spam` method in the user model since it is no longer needed
- Remove the `domain` interpolation variable from all translation files
- Add "All posts from this user that include links should be reviewed." to server.en.yml for added clarity on why the posts entered the queue
---
 app/models/user.rb              | 1 -
 config/locales/server.ar.yml    | 2 +-
 config/locales/server.be.yml    | 2 +-
 config/locales/server.ca.yml    | 2 +-
 config/locales/server.de.yml    | 2 +-
 config/locales/server.el.yml    | 2 +-
 config/locales/server.en.yml    | 2 +-
 config/locales/server.es.yml    | 2 +-
 config/locales/server.fa_IR.yml | 2 +-
 config/locales/server.fi.yml    | 2 +-
 config/locales/server.fr.yml    | 2 +-
 config/locales/server.he.yml    | 2 +-
 config/locales/server.it.yml    | 2 +-
 config/locales/server.nl.yml    | 2 +-
 config/locales/server.pl_PL.yml | 2 +-
 config/locales/server.pt.yml    | 2 +-
 config/locales/server.pt_BR.yml | 2 +-
 config/locales/server.ro.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 +-
 lib/reviewable/conversation.rb  | 2 +-
 23 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 7ed158b2a2..337748b75a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1006,7 +1006,6 @@ class User < ActiveRecord::Base
 
       message = I18n.t(
         'flag_reason.spam_hosts',
-        domain: tl.domain,
         base_path: Discourse.base_path,
         locale: SiteSetting.default_locale
       )
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index a3e5bd858a..3cc9986c78 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1505,7 +1505,7 @@ ar:
     missing: "نأسف، لم نعثر على أيّ صورة رمزيّة مرتبطة بعنوان البريد هذا. هلّا أعدت رفعها ثانيةً؟"
   flag_reason:
     sockpuppet: "عضو جديد نشر موضوع جديد ثم قام عضو جديد اخر له نفس الIP (%{ip_address}) بالرد علية. انظر إعدادات<a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان (%{domain}). انظر إعدادات <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان. انظر إعدادات <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     user_email_no_user: "تعذّر العثور على مستخدم معرّفه %{user_id}"
     user_email_post_not_found: "تعذر إيجاد المشاركة ذات المعرف %{post_id}"
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index b47d4b32b7..8bd9573a36 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -1952,7 +1952,7 @@ be:
     missing: "На жаль, мы не можам знайсці якія-небудзь аватар, звязаны з гэтым адрасам электроннай пошты. Вы можаце паспрабаваць загрузіць яго зноў?"
   flag_reason:
     sockpuppet: "Новы карыстальнік стварыў тэму, і яшчэ адзін новы карыстальнік у тым жа IP-адрасе (% {ip_address}) адказаў. См% Класс <A HREF = '{базовый_путь}"
-    spam_hosts: "Гэты новы карыстальнік спрабаваў стварыць некалькі пастоў з спасылкамі на адной і той жа вобласці (% {дамена}). См% Класс <A HREF = '{базовый_путь}"
+    spam_hosts: "Гэты новы карыстальнік спрабаваў стварыць некалькі пастоў з спасылкамі на адной і той жа вобласці. См% Класс <A HREF = '{базовый_путь}"
   skipped_email_log:
     exceeded_emails_limit: "перавышаны max_emails_per_day_per_user"
     exceeded_bounces_limit: "перавышаны bounce_score_threshold"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 8037e5dc13..594ae1fc51 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -2781,7 +2781,7 @@ ca:
     missing: "No podem trobar cap avatar associat amb aquesta adreça de correu. Proveu de pujar-lo de nou."
   flag_reason:
     sockpuppet: "Un usuari nou ha creat un tema, i un altre usuari nou amb la mateixa adreça IP (%{ip_address}) hi ha respost. Mireu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> de la configuració del lloc web."
-    spam_hosts: "Aquest usuari nou ha creat moltes publicacions amb enllaços al mateix domini (%{domain}). Vegeu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> de la configuració del lloc web."
+    spam_hosts: "Aquest usuari nou ha creat moltes publicacions amb enllaços al mateix domini. Vegeu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> de la configuració del lloc web."
   skipped_email_log:
     exceeded_emails_limit: "S'ha excedit max_emails_per_day_per_user"
     exceeded_bounces_limit: "S'ha superat bounce_score_threshold"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 991bbabbe5..862a0be27d 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -3170,7 +3170,7 @@ de:
     missing: "Hoppla, wir können kein Profilbild für diese E-Mail-Adresse finden. Kannst du versuchen es erneut hochzuladen?"
   flag_reason:
     sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP-Adresse (%{ip_address}) hat darauf geantwortet. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> Einstellung."
-    spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain (%{domain}) zu schreiben. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>-Einstellung."
+    spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain zu schreiben. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>-Einstellung."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user überschritten"
     exceeded_bounces_limit: "bounce_score_threshold wurde überschritten"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 19e6640d68..83154ed945 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -2213,7 +2213,7 @@ el:
     missing: "Λυπούμαστε, αλλά δεν μπορέσαμε να βρούμε κάποιο άβαταρ που να αντιστοιχίζεται με τη συγκεκριμένη διεύθυνση email. Μπορείτε να δοκιμάσετε να το ανεβάσετε ξανά;"
   flag_reason:
     sockpuppet: "Ένας νέος χρήστης δημιούργησε ένα νήμα και ένας άλλος νέος χρήσης με την ίδια διεύθυνση IP (%{ip_address}) απάντησε. Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain (%{domain}). Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain. Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Υπέρβαση max_emails_per_day_per_user"
     exceeded_bounces_limit: "Υπέρβαση bounce_score_threshold"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d88a01ccc1..61c5369303 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3638,7 +3638,7 @@ en:
 
   flag_reason:
     sockpuppet: "A new user created a topic, and another new user at the same IP address (%{ip_address}) replied. See the <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> site setting."
-    spam_hosts: "This new user tried to create multiple posts with links to the same domain (%{domain}). See the <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> site setting."
+    spam_hosts: "This new user tried to create multiple posts with links to the same domain. All posts from this user that include links should be reviewed. See the <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> site setting."
 
   skipped_email_log:
     exceeded_emails_limit: "Exceeded max_emails_per_day_per_user"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 57f5437b0b..e4edd47efb 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -3213,7 +3213,7 @@ es:
     missing: "Lo sentimos, no pudimos encontrar un avatar asociado a esa dirección de correo electrónico. ¿Puedes intentar subirlo de nuevo?"
   flag_reason:
     sockpuppet: "Un usuario nuevo creó un tema y otro usuario nuevo le ha respondido desde la misma dirección IP (%{ip_address}). Revisa la opción <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> en la configuración del sitio."
-    spam_hosts: "Este usuario nuevo intentó crear varios temas con enlaces al mismo dominio (%{domain}). Revisa la opción <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> en la configuración del sitio."
+    spam_hosts: "Este usuario nuevo intentó crear varios temas con enlaces al mismo dominio. Revisa la opción <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> en la configuración del sitio."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user excedido"
     exceeded_bounces_limit: "bounce_score_threshold excedido"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 2de06d7624..712f34bd51 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -1988,7 +1988,7 @@ fa_IR:
     missing: "با عرض پوزش، نمی‌توانیم آواتار مرتبطی با این ایمیل پیدا کنیم. لطفا دوباره آپلود کنید."
   flag_reason:
     sockpuppet: "یک کاربر جدید موضوع جدیدی ایجاد کرده و کاربری با همان آیپی به موضوع پاسخ داده (%{ip_address}). قسمت <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> را از تنظیمات سایت ببینید."
-    spam_hosts: "این کاربر تلاش کرده چند نوشته با لینک به یک دامنه ارسال کند(%{domain}). قسمت <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> را از تنظیمات سایت ببینید."
+    spam_hosts: "این کاربر تلاش کرده چند نوشته با لینک به یک دامنه ارسال کند. قسمت <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> را از تنظیمات سایت ببینید."
   skipped_email_log:
     exceeded_emails_limit: "مقدار max_emails_per_day_per_user بیش از حد مجاز است"
     exceeded_bounces_limit: "مقدار bounce_score_threshold بیش از حد مجاز است"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 23cc32ab28..4304ef29bd 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -2975,7 +2975,7 @@ fi:
     missing: "Pahoittelut, emme löydä profiilikuvaa, joka olisi yhdistetty tähän sähköpostiosoitteeseen. Voitko yrittää ladata sen uudestaan?"
   flag_reason:
     sockpuppet: "Uusi käyttäjä aloitti ketjun, johon toinen uusi käyttäjä samasta IP-osoitteesta (%{ip_address}) vastasi. Katso asetus <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Tämä uusi käyttäjä yritti luoda useita viestejä, jotka sisälsivät linkkejä samaan verkkotunnukseen (%{domain}). Katso asetus <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Tämä uusi käyttäjä yritti luoda useita viestejä, jotka sisälsivät linkkejä samaan verkkotunnukseen. Katso asetus <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user ylitettiin"
     exceeded_bounces_limit: "bounce_score_threshold ylitettiin"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 4ef2c26c8c..195ef25a12 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -3165,7 +3165,7 @@ fr:
     missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?"
   flag_reason:
     sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP (%{ip_address}) a répondu. Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine (%{domain}). Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine. Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user dépassé"
     exceeded_bounces_limit: "bounce_score_threshold dépassé"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 7f610a0db5..ca4f8a82ff 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -3341,7 +3341,7 @@ he:
     missing: "מצטערים, אנחנו לא יכולים למצוא אף דמות שמקושרת לכתובת מייל זו. תוכלו להעלות זאת שוב?"
   flag_reason:
     sockpuppet: "משתמש חדש יצר נושא, ומשתמש חדש אחר מאותה כתובת IP (%{ip_address}) ענו להם. ראו את הגדרת האתר <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "משתמש חדש זה ניסה ליצור מספר פוסטים עם קישורים לאותה הכתובת (%{domain}). ראו את הגדרת האתר <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "משתמש חדש זה ניסה ליצור מספר פוסטים עם קישורים לאותה הכתובת. ראו את הגדרת האתר <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "נחצה max_emails_per_day_per_user"
     exceeded_bounces_limit: "נחצה bounce_score_threshold"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 915fe730b0..9aa94b4135 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -2991,7 +2991,7 @@ it:
     missing: "Spiacenti, non troviamo nessun avatar associato a questo indirizzo email. Puoi provare a caricarlo nuovamente?"
   flag_reason:
     sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto dallo stesso indirizzo IP (%{ip_address}). Vedi l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio (%{domain}). Vedi l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio. Vedi l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Ha superato max_emails_per_day_per_user"
     exceeded_bounces_limit: "Ha superato bounce_score_threshold"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index e78a0e9bd1..2409e6e5bc 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -2387,7 +2387,7 @@ nl:
     missing: "Sorry, we kunnen geen avatar vinden die met dat e-mailadres is gekoppeld. Kunt u proberen deze opnieuw te uploaden?"
   flag_reason:
     sockpuppet: "Een nieuwe gebruiker heeft een topic aangemaakt, en een andere nieuwe gebruiker op hetzelfde IP-adres (%{ip_address}) heeft geantwoord. Bekijk de website-instelling <a href='%{base_path}/admin/site_settings/category/spam'>'flag_sockpuppets'</a>."
-    spam_hosts: "Deze nieuwe gebruiker heeft geprobeerd meerdere berichten met koppelingen naar hetzelfde domein (%{domain}) aan te maken. Bekijk de website-instelling <a href='%{base_path}/admin/site_settings/category/spam'>newuser_spam_host_threshold</a>."
+    spam_hosts: "Deze nieuwe gebruiker heeft geprobeerd meerdere berichten met koppelingen naar hetzelfde domein aan te maken. Bekijk de website-instelling <a href='%{base_path}/admin/site_settings/category/spam'>newuser_spam_host_threshold</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user overschreden"
     exceeded_bounces_limit: "bounce_score_threshold overschreden"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 009dcfada9..d217b61d4a 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -2356,7 +2356,7 @@ pl_PL:
     missing: "Przepraszamy, nie możemy odnaleźć żadnego avatara przypisanego do tego konta email. Spróbuj załadować go ponownie"
   flag_reason:
     sockpuppet: "Nowy użytkownik stworzył temat, a inny nowy użytkownik z tym samym adresem IP (%{ip_address}) odpowiedział. <a href='%{base_path}/admin/site_settings/category/spam'>'flag_sockpuppets'</a> ustawienia strony."
-    spam_hosts: "Ten nowy użytkownik próbował stworzyć wiele postów z linkami do tej samej domeny (%{domain}). Zobacz <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold</a> ustawienia strony."
+    spam_hosts: "Ten nowy użytkownik próbował stworzyć wiele postów z linkami do tej samej domeny. Zobacz <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold</a> ustawienia strony."
   skipped_email_log:
     exceeded_emails_limit: "Przekroczono maksymalną, dzienną liczbę emaili dla użytkownika"
     exceeded_bounces_limit: "Przekroczono bounce_score_threshold "
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 079927df7c..703522e759 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1732,7 +1732,7 @@ pt:
     missing: "Desculpe, mas não conseguimos encontrar nenhum avatar associado com esse endereço de email. Pode tentar carregá-lo novamente?"
   flag_reason:
     sockpuppet: "Um novo utilizador criou um tópico, no qual um outro novo utilizador com o mesmo IP (%{ip_address}) respondeu. Veja as configurações de <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> nas configurações do sítio."
-    spam_hosts: "Este novo utilizador tentou criar múltiplas publicações com ligações ao mesmo domínio (%{domain}). Verifique as configurações do sítio de <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Este novo utilizador tentou criar múltiplas publicações com ligações ao mesmo domínio. Verifique as configurações do sítio de <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Excedeu max_emails_per_day_per_user"
     exceeded_bounces_limit: "Ultrapassou bounce_score_threshold"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 11bbbe1ec4..d70f59a881 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -3071,7 +3071,7 @@ pt_BR:
     missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?"
   flag_reason:
     sockpuppet: "Um novo usuário criou um tópico, e um outro novo usuário no mesmo endereço IP (%{ip_address}) respondeu. Veja a configuração <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> do site."
-    spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio (%{domain}). Veja a configuração <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> do site."
+    spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio. Veja a configuração <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> do site."
   skipped_email_log:
     exceeded_emails_limit: "Excedido max_emails_per_day_per_user"
     exceeded_bounces_limit: "Excedido bounce_score_threshold"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 7980d31645..141e5150a6 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1659,7 +1659,7 @@ ro:
     missing: "Ne pare rău, dar nu putem găsi avatarul asociat cu această adresă de email. Ai putea să îl încarci din nou?"
   flag_reason:
     sockpuppet: "Un utilizator nou a creat un subiect, și un alt utilizator nou de la aceeași adresă de IP (%{ip_address}) a răspuns. Vezi <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> la setările site-ului."
-    spam_hosts: "Acest nou utilizator a încrecat să creeze postări multiple cu link-uri către acelasi domeniu (%{domain}). Vezi <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> la setările site-ului."
+    spam_hosts: "Acest nou utilizator a încrecat să creeze postări multiple cu link-uri către acelasi domeniu. Vezi <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> la setările site-ului."
   skipped_email_log:
     exceeded_emails_limit: "Depășit max_emails_per_day_per_user"
     exceeded_bounces_limit: "Depășit bounce_score_threshold"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index d9871774af..d328125a6d 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -2292,7 +2292,7 @@ ru:
     missing: "К сожалению, нам не удалось найти ни одного аватара, связанного с этим электронным адресом. Попытаетесь загрузить аватар снова?"
   flag_reason:
     sockpuppet: "Новый пользователь создал тему, а другой новый пользователь ответил с этого же IP адреса (%{ip_address}). Смотрите параметр <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> сайта."
-    spam_hosts: "Этот новый пользователь пытался создать множество сообщений с ссылками на один и тот же домен (%{domain}). Смотрите параметр <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> сайта."
+    spam_hosts: "Этот новый пользователь пытался создать множество сообщений с ссылками на один и тот же домен. Смотрите параметр <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> сайта."
   skipped_email_log:
     exceeded_emails_limit: "Превышен max_emails_per_day_per_user"
     exceeded_bounces_limit: "Превышен bounce_score_threshold"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 7cccd9846e..41a036709b 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -1782,7 +1782,7 @@ sl:
     edit_reason: "prenos slik v lokalno kopijo"
   flag_reason:
     sockpuppet: "Nov uporabnik je ustvaril temo in drugi novi uporabnik z enakim IP naslovom (%{ip_address}) je odgovoril. Preverite <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> nastavitev strani."
-    spam_hosts: "Ta novi uporabnik je poskusil ustvariti več prispevkov z povezavami na enako domeno (%{domain}). Preverite <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> nastavitev strani."
+    spam_hosts: "Ta novi uporabnik je poskusil ustvariti več prispevkov z povezavami na enako domeno. Preverite <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> nastavitev strani."
   edit_this_page: "Uredi to stran"
   csv_export:
     boolean_yes: "Da"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index db726cab34..4d1a95b9ec 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1604,7 +1604,7 @@ sv:
     missing: "Tyvärr, vi kunde inte hitta någon avatar associerad med den e-postadressen. Kan du försöka ladda upp den igen?"
   flag_reason:
     sockpuppet: "En ny användare skapade ett ämne, och en annan ny användare på samma IP-adress (%{ip_address}) svarade. Granska webbplatsinställningen <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Den här nya användaren försökte skapa flera inlägg med länkar till samma domän (%{domain}). Granska webbplatsinställningen <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Den här nya användaren försökte skapa flera inlägg med länkar till samma domän. Granska webbplatsinställningen <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Översteg max_emails_per_day_per_user"
     exceeded_bounces_limit: "Översteg bounce_score_threshold"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 22ffedf85e..ea688c5c82 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -1846,7 +1846,7 @@ sw:
     missing: "Samahani, tumeshindwa kuona picha inayoendana na barua pepe hiyo. Unaweza kuipakia tena?"
   flag_reason:
     sockpuppet: "Mtumiaji mpya ametengeneza mada, na mtumiaji mpya mwenye anwani ya mtandao hiyo hiyo (%{ip_address}) amejibu. Angalia mpangilio wa tovuti <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Mtumiaji mpya amejaribu kutengeneza machapisho mengi yenye viungo kwenda kwa kikoa (%{domain}). Tembelea <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> mpangilio wa tovuti."
+    spam_hosts: "Mtumiaji mpya amejaribu kutengeneza machapisho mengi yenye viungo kwenda kwa kikoa. Tembelea <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> mpangilio wa tovuti."
   skipped_email_log:
     exceeded_emails_limit: "Kiwango kimepita max_emails_per_day_per_user"
     exceeded_bounces_limit: "Kiwango kimepita bounce_score_threshold"
diff --git a/lib/reviewable/conversation.rb b/lib/reviewable/conversation.rb
index 1b867888f3..53eba48ef1 100644
--- a/lib/reviewable/conversation.rb
+++ b/lib/reviewable/conversation.rb
@@ -15,7 +15,7 @@ class Reviewable < ActiveRecord::Base
       end
 
       def self.excerpt(cooked)
-        excerpt = ::Post.excerpt(cooked, 200, keep_emoji_images: true)
+        excerpt = ::Post.excerpt(cooked, 250, keep_emoji_images: true)
         # remove the first link if it's the first node
         fragment = Nokogiri::HTML.fragment(excerpt)
         if fragment.children.first == fragment.css("a:first").first && fragment.children.first

From 054fbd7846546ae68a5703d47e1750db1bc34ffd Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 18 Oct 2019 13:16:52 -0500
Subject: [PATCH 097/328] FEATURE: Remember scroll position in private message
 lists (#8212)

* FEATURE: remember position in private message lists

* Unified saving scroll position between topic lists

* added discovery-topics-list template

* ran prettier

* removed dynamic scroll key

* JS cleanup
---
 .../components/discovery-topics-list.js.es6   |  5 ----
 .../discourse/components/topic-list.js.es6    | 27 ++++++++++++++++++-
 .../controllers/user-topics-list.js.es6       |  4 +++
 .../build-private-messages-route.js.es6       | 17 +++++++++---
 .../templates/components/basic-topic-list.hbs |  5 +++-
 .../components/discovery-topics-list.hbs      |  3 +++
 .../discourse/templates/discovery/topics.hbs  |  5 ++--
 .../discourse/templates/user-topics-list.hbs  |  4 ++-
 8 files changed, 56 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs

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 10a73fcd5e..3a5f30e4f5 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -36,11 +36,6 @@ const DiscoveryTopicsListComponent = Ember.Component.extend(
       this.session.set("topicListScrollPosition", $(window).scrollTop());
     },
 
-    scrolled() {
-      this._super(...arguments);
-      this.saveScrollPosition();
-    },
-
     actions: {
       loadMore() {
         Discourse.updateContextCount(0);
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 294563feaa..8eaa73dd26 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -2,8 +2,9 @@ import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
+import LoadMore from "discourse/mixins/load-more";
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(LoadMore, {
   tagName: "table",
   classNames: ["topic-list"],
   showTopicPostBadges: true,
@@ -54,6 +55,30 @@ export default Ember.Component.extend({
     this.refreshLastVisited();
   },
 
+  scrolled() {
+    this._super(...arguments);
+    let onScroll = this.onScroll;
+    if (!onScroll) return;
+
+    onScroll.call(this);
+  },
+
+  scrollToLastPosition() {
+    if (!this.scrollOnLoad) return;
+
+    let scrollTo = this.session.get("topicListScrollPosition");
+    if (scrollTo && scrollTo >= 0) {
+      Ember.run.schedule("afterRender", () =>
+        $(window).scrollTop(scrollTo + 1)
+      );
+    }
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.scrollToLastPosition();
+  },
+
   _updateLastVisitedTopic(topics, order, ascending, top) {
     this.set("lastVisitedTopic", null);
 
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 a4d822a565..dd453138d8 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -16,6 +16,10 @@ export default Ember.Controller.extend({
     this.newIncoming = [];
   },
 
+  saveScrollPosition: function() {
+    this.session.set("topicListScrollPosition", $(window).scrollTop());
+  },
+
   _showFooter: function() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   }.observes("model.canLoadMore"),
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.es6
index 4ebca3108a..820a41cf8d 100644
--- a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
@@ -18,10 +18,19 @@ export default (viewName, path, channel) => {
     },
 
     model() {
-      return this.store.findFiltered("topicList", {
-        filter:
-          "topics/" + path + "/" + this.modelFor("user").get("username_lower")
-      });
+      const session = Discourse.Session.current();
+      let filter =
+        "topics/" + path + "/" + this.modelFor("user").get("username_lower");
+      let lastTopicList = session.get("topicList");
+      if (lastTopicList && lastTopicList.filter === filter) {
+        return lastTopicList;
+      } else {
+        session.setProperties({
+          topicList: null,
+          topicListScrollPosition: null
+        });
+        return this.store.findFiltered("topicList", { filter });
+      }
     },
 
     setupController() {
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 d1d105121e..44d9dc579d 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -18,7 +18,10 @@
                  canBulkSelect=canBulkSelect
                  selected=selected
                  skipHeader=skipHeader
-                 tagsForUser=tagsForUser}}
+                 tagsForUser=tagsForUser
+                 onScroll=onScroll
+                 scrollOnLoad=scrollOnLoad}}
+
   {{else}}
     {{#unless loadingMore}}
     <div class='alert alert-info'>
diff --git a/app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs b/app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs
new file mode 100644
index 0000000000..c1528526e6
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs
@@ -0,0 +1,3 @@
+{{yield (hash
+  saveScrollPosition=saveScrollPosition
+)}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index ff8ca998aa..a449e010a9 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -26,7 +26,7 @@
 
 {{bulk-select-button selected=selected action=(action "refresh") category=category}}
 
-{{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount}}
+{{#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")}}
@@ -61,7 +61,8 @@
       expandAllPinned=expandAllPinned
       category=category
       topics=model.topics
-      discoveryList=true}}
+      discoveryList=true
+      onScroll=discoveryTopicList.saveScrollPosition}}
   {{/if}}
 {{/discovery-topics-list}}
 
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
index e59ec595e1..adeab89c7f 100644
--- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
@@ -7,7 +7,9 @@
                      hasIncoming=hasIncoming
                      incomingCount=incomingCount
                      showInserted=(action "showInserted")
-                     tagsForUser=tagsForUser}}
+                     tagsForUser=tagsForUser
+                     onScroll=saveScrollPosition
+                     scrollOnLoad=true}}
 
   {{conditional-loading-spinner condition=model.loadingMore}}
 {{/load-more}}

From 858cf5836cbd74e11e551359507b9d99403c7c7f Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Mon, 21 Oct 2019 09:59:24 +1100
Subject: [PATCH 098/328] FIX: update Redis gem to version 4.1.3

I run our benchmark on commit with hiredis and redis-4.1.3

Results:
type | hidredis | redis 4.1.3 | percent
--- | --- | --- | ---
Categories-50 | 49 | 50 | 102.04%
Categories-75 | 51 | 51 | 100.00%
Categories-90 | 63 | 64 | 101.59%
Categories-99 | 86 | 85 | 98.84%
Home-50 | 55 | 55 | 100.00%
Home-75 | 56 | 57 | 101.79%
Home-90 | 68 | 69 | 101.47%
Home-99 | 102 | 104 | 101.96%
Topic-50 | 36 | 37 | 102.78%
Topic-75 | 37 | 37 | 100.00%
Topic-90 | 47 | 48 | 102.13%
Topic-99 | 60 | 61 | 101.67%
Categories-admin-50 | 124 | 117 | 94.35%
Categories-admin-75 | 130 | 129 | 99.23%
Categories-admin-90 | 147 | 143 | 97.28%
Categories-admin-99 | 204 | 199 | 97.55%
Home-admin-50 | 146 | 148 | 101.37%
Home-admin-75 | 150 | 152 | 101.33%
Home-admin-90 | 169 | 168 | 99.41%
Home-admin-99 | 232 | 223 | 96.12%
Topic-admin-50 | 60 | 61 | 101.67%
Topic-admin-75 | 64 | 63 | 98.44%
Topic-admin-90 | 76 | 73 | 96.05%
Topic-admin-99 | 124 | 94 | 75.81%
Load rails | 2412 | 2360 | 97.84%
rss | 290204 | 295828 | 101.94%
pss | 277948 | 283624 | 102.04%

Redis gem is manipulating Redis config https://github.com/redis/redis-rb/blob/master/lib/redis/client.rb#L95
therefore we cannot pass the frozen config object.

Pass of the copy of the object is protecting original config
---
 Gemfile                      |  9 +--------
 Gemfile.lock                 |  6 +++---
 config/application.rb        |  1 -
 lib/discourse_redis.rb       |  2 +-
 lib/freedom_patches/redis.rb | 16 ----------------
 5 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 lib/freedom_patches/redis.rb

diff --git a/Gemfile b/Gemfile
index d523170a4e..8f032801eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,14 +36,7 @@ gem 'mail', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
-# holding off redis upgrade temporarily as it is having issues with our current
-# freedom patch, we will follow this up.
-#
-# FrozenError: can't modify frozen Hash
-# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `delete'
-# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `initialize'
-# /var/www/discourse/lib/freedom_patches/redis.rb:7:in `initialize'
-gem 'redis', '4.0.1'
+gem 'redis', '4.1.3'
 gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index f58c26a167..b43335ea81 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.13)
-    message_bus (2.2.2)
+    message_bus (2.2.3)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.9.2)
@@ -309,7 +309,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.0.1)
+    redis (4.1.3)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     request_store (1.4.1)
@@ -516,7 +516,7 @@ DEPENDENCIES
   rb-inotify (~> 0.9)
   rbtrace
   rchardet
-  redis (= 4.0.1)
+  redis (= 4.1.3)
   redis-namespace
   rinku
   rotp
diff --git a/config/application.rb b/config/application.rb
index dd56bf859f..a8f2fcc98f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -241,7 +241,6 @@ module Discourse
 
     require 'discourse_redis'
     require 'logster/redis_store'
-    require 'freedom_patches/redis'
     # Use redis for our cache
     config.cache_store = DiscourseRedis.new_redis_store
     $redis = DiscourseRedis.new
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 89e588806f..ae2884f933 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -155,7 +155,7 @@ class DiscourseRedis
 
   def initialize(config = nil, namespace: true)
     @config = config || DiscourseRedis.config
-    @redis = DiscourseRedis.raw_connection(@config)
+    @redis = DiscourseRedis.raw_connection(@config.dup)
     @namespace = namespace
   end
 
diff --git a/lib/freedom_patches/redis.rb b/lib/freedom_patches/redis.rb
deleted file mode 100644
index 8945ece473..0000000000
--- a/lib/freedom_patches/redis.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# https://github.com/redis/redis-rb/pull/591
-class Redis
-  class Client
-    alias_method :old_initialize, :initialize
-
-    def initialize(options = {})
-      old_initialize(options)
-
-      if options.include?(:connector) && options[:connector].is_a?(Class)
-        @connector = options[:connector].new(@options)
-      end
-    end
-  end
-end

From 98d6cee7c703cf1bdb93ab55e9ee3725c5cb2ba5 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 21 Oct 2019 08:57:55 +1100
Subject: [PATCH 099/328] FIX: various fixes to draft system

- destroyDraft which is called when we cancel a draft is now async,
  removing race conditions when you click "reply" to a post and are
  already editing. We used to trigger double dialogs for cancelling
  drafts which was confusing.

- Remove reply as new topic / reply as pm keys, they are no longer
  used and only caused confustion. For example we used to pop up a
  warning when you are composing a reply and flick to reply as
  new topic

- Remove createTopic key, this was a bug that proliferated. Whenever
  creating a topic via the C shortcut or clicking on new topic on full
  screen search the correct new topic draft key will be used
  consistently

- When abandoning an edit we now say "Are you sure you want to discard
  your changes" (instead of abandon your post which is confusing)
---
 .../components/composer-editor.js.es6         |   7 +-
 .../discourse/controllers/composer.js.es6     | 125 +++++++++---------
 .../controllers/full-page-search.js.es6       |   2 +-
 .../discourse/controllers/topic.js.es6        |   4 +-
 .../discourse/lib/keyboard-shortcuts.js.es6   |   2 +-
 .../discourse/mixins/open-composer.js.es6     |   2 +-
 .../discourse/models/composer.js.es6          |   9 +-
 .../discourse/routes/application.js.es6       |   2 +-
 .../routes/user-private-messages.js.es6       |   3 +-
 .../components/composer-actions.js.es6        |   7 +-
 config/locales/client.en.yml                  |   6 +
 11 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 3c204ec0c7..c48098bce9 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -590,12 +590,7 @@ export default Ember.Component.extend({
   _warnCannotSeeMention($preview) {
     const composerDraftKey = this.get("composer.draftKey");
 
-    if (
-      composerDraftKey === Composer.CREATE_TOPIC ||
-      composerDraftKey === Composer.NEW_PRIVATE_MESSAGE_KEY ||
-      composerDraftKey === Composer.REPLY_AS_NEW_TOPIC_KEY ||
-      composerDraftKey === Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
-    ) {
+    if (composerDraftKey === Composer.NEW_PRIVATE_MESSAGE_KEY) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index c5c68d095c..595568eec2 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -78,14 +78,6 @@ export default Ember.Controller.extend({
   topicController: Ember.inject.controller("topic"),
   router: Ember.inject.service(),
 
-  replyAsNewTopicDraft: Ember.computed.equal(
-    "model.draftKey",
-    Composer.REPLY_AS_NEW_TOPIC_KEY
-  ),
-  replyAsNewPrivateMessageDraft: Ember.computed.equal(
-    "model.draftKey",
-    Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
-  ),
   checkedMessages: false,
   messageCount: null,
   showEditReason: false,
@@ -677,47 +669,54 @@ export default Ember.Controller.extend({
             }
           }
 
-          this.destroyDraft();
-          this.close();
-          this.appEvents.trigger("post-stream:refresh");
-          return result;
+          return this.destroyDraft().then(() => {
+            this.close();
+            this.appEvents.trigger("post-stream:refresh");
+            return result;
+          });
         }
 
         // If user "created a new topic/post" or "replied as a new topic" successfully, remove the draft.
-        if (
-          result.responseJson.action === "create_post" ||
-          this.replyAsNewTopicDraft ||
-          this.replyAsNewPrivateMessageDraft
-        ) {
-          this.destroyDraft();
-        }
-        if (this.get("model.editingPost")) {
-          this.appEvents.trigger("post-stream:refresh", {
-            id: parseInt(result.responseJson.id)
-          });
-          if (result.responseJson.post.post_number === 1) {
-            this.appEvents.trigger("header:update-topic", composer.topic);
-          }
-        } else {
-          this.appEvents.trigger("post-stream:refresh");
-        }
+        let destroyDraftPromise;
 
         if (result.responseJson.action === "create_post") {
-          this.appEvents.trigger("post:highlight", result.payload.post_number);
-        }
-        this.close();
-
-        const currentUser = this.currentUser;
-        if (composer.creatingTopic) {
-          currentUser.set("topic_count", currentUser.topic_count + 1);
+          destroyDraftPromise = this.destroyDraft();
         } else {
-          currentUser.set("reply_count", currentUser.reply_count + 1);
+          destroyDraftPromise = Ember.RSVP.Promise.resolve();
         }
 
-        const post = result.target;
-        if (post && !staged) {
-          DiscourseURL.routeTo(post.url);
-        }
+        return destroyDraftPromise.then(() => {
+          if (this.get("model.editingPost")) {
+            this.appEvents.trigger("post-stream:refresh", {
+              id: parseInt(result.responseJson.id)
+            });
+            if (result.responseJson.post.post_number === 1) {
+              this.appEvents.trigger("header:update-topic", composer.topic);
+            }
+          } else {
+            this.appEvents.trigger("post-stream:refresh");
+          }
+
+          if (result.responseJson.action === "create_post") {
+            this.appEvents.trigger(
+              "post:highlight",
+              result.payload.post_number
+            );
+          }
+          this.close();
+
+          const currentUser = this.currentUser;
+          if (composer.creatingTopic) {
+            currentUser.set("topic_count", currentUser.topic_count + 1);
+          } else {
+            currentUser.set("reply_count", currentUser.reply_count + 1);
+          }
+
+          const post = result.target;
+          if (post && !staged) {
+            DiscourseURL.routeTo(post.url);
+          }
+        });
       })
       .catch(error => {
         composer.set("disableDrafts", false);
@@ -783,11 +782,7 @@ export default Ember.Controller.extend({
     });
 
     // Scope the categories drop down to the category we opened the composer with.
-    if (
-      opts.categoryId &&
-      opts.draftKey !== "reply_as_new_topic" &&
-      !opts.disableScopedCategory
-    ) {
+    if (opts.categoryId && !opts.disableScopedCategory) {
       const category = this.site.categories.findBy("id", opts.categoryId);
       if (category) {
         this.set("scopedCategoryId", opts.categoryId);
@@ -847,7 +842,6 @@ export default Ember.Controller.extend({
               data.draft = undefined;
               return data;
             }
-
             return this.confirmDraftAbandon(data);
           })
           .then(data => {
@@ -862,7 +856,9 @@ export default Ember.Controller.extend({
       // otherwise, do the draft check async
       else if (!opts.draft && !opts.skipDraftCheck) {
         Draft.get(opts.draftKey)
-          .then(data => this.confirmDraftAbandon(data))
+          .then(data => {
+            return this.confirmDraftAbandon(data);
+          })
           .then(data => {
             if (data.draft) {
               opts.draft = data.draft;
@@ -943,9 +939,11 @@ export default Ember.Controller.extend({
         this.send("clearTopicDraft");
       }
 
-      Draft.clear(key, this.get("model.draftSequence")).then(() =>
+      return Draft.clear(key, this.get("model.draftSequence")).then(() =>
         this.appEvents.trigger("draft:destroyed", key)
       );
+    } else {
+      return Ember.RSVP.Promise.resolve();
     }
   },
 
@@ -985,13 +983,16 @@ export default Ember.Controller.extend({
   },
 
   cancelComposer(differentDraft = false) {
+    const keyPrefix =
+      this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
+
     return new Ember.RSVP.Promise(resolve => {
       if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
-        bootbox.dialog(I18n.t("post.abandon.confirm"), [
+        bootbox.dialog(I18n.t(keyPrefix + ".confirm"), [
           {
             label: differentDraft
-              ? I18n.t("post.abandon.no_save_draft")
-              : I18n.t("post.abandon.no_value"),
+              ? I18n.t(keyPrefix + ".no_save_draft")
+              : I18n.t(keyPrefix + ".no_value"),
             callback: () => {
               // cancel composer without destroying draft on new draft context
               if (differentDraft) {
@@ -1002,24 +1003,26 @@ export default Ember.Controller.extend({
             }
           },
           {
-            label: I18n.t("post.abandon.yes_value"),
+            label: I18n.t(keyPrefix + ".yes_value"),
             class: "btn-danger",
             callback: result => {
               if (result) {
-                this.destroyDraft();
-                this.model.clearState();
-                this.close();
-                resolve();
+                this.destroyDraft().then(() => {
+                  this.model.clearState();
+                  this.close();
+                  resolve();
+                });
               }
             }
           }
         ]);
       } else {
         // it is possible there is some sort of crazy draft with no body ... just give up on it
-        this.destroyDraft();
-        this.model.clearState();
-        this.close();
-        resolve();
+        this.destroyDraft().then(() => {
+          this.model.clearState();
+          this.close();
+          resolve();
+        });
       }
     });
   },
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 c7175a47fd..29b7093007 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -285,7 +285,7 @@ export default Ember.Controller.extend({
       }
       this.composer.open({
         action: Composer.CREATE_TOPIC,
-        draftKey: Composer.CREATE_TOPIC,
+        draftKey: Composer.NEW_TOPIC_KEY,
         topicCategory
       });
     },
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index f459e4bcec..5e368497f2 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -965,13 +965,13 @@ export default Ember.Controller.extend(bufferedProperty("model"), {
         options = {
           action: Composer.PRIVATE_MESSAGE,
           archetypeId: "private_message",
-          draftKey: Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY,
+          draftKey: post.topic.draft_key,
           usernames: usernames
         };
       } else {
         options = {
           action: Composer.CREATE_TOPIC,
-          draftKey: Composer.REPLY_AS_NEW_TOPIC_KEY,
+          draftKey: post.topic.draft_key,
           categoryId: this.get("model.category.id")
         };
       }
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index e051f479ff..aa0b16efbb 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -241,7 +241,7 @@ export default {
 
     this.container.lookup("controller:composer").open({
       action: Composer.CREATE_TOPIC,
-      draftKey: Composer.CREATE_TOPIC
+      draftKey: Composer.NEW_TOPIC_KEY
     });
   },
 
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
index 7d925ab652..29a4aca243 100644
--- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6
+++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
@@ -15,7 +15,7 @@ export default Ember.Mixin.create({
     this.controllerFor("composer").open({
       categoryId,
       action: Composer.CREATE_TOPIC,
-      draftKey: controller.get("model.draft_key") || Composer.CREATE_TOPIC,
+      draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
       draftSequence: controller.get("model.draft_sequence") || 0
     });
   },
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 5f13fb0940..4517051df3 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -17,12 +17,10 @@ export const CREATE_TOPIC = "createTopic",
   CREATE_SHARED_DRAFT = "createSharedDraft",
   EDIT_SHARED_DRAFT = "editSharedDraft",
   PRIVATE_MESSAGE = "privateMessage",
-  NEW_PRIVATE_MESSAGE_KEY = "new_private_message",
-  NEW_TOPIC_KEY = "new_topic",
   REPLY = "reply",
   EDIT = "edit",
-  REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic",
-  REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message";
+  NEW_PRIVATE_MESSAGE_KEY = "new_private_message",
+  NEW_TOPIC_KEY = "new_topic";
 
 function isEdit(action) {
   return action === EDIT || action === EDIT_SHARED_DRAFT;
@@ -1151,8 +1149,7 @@ Composer.reopenClass({
 
   // Draft key
   NEW_PRIVATE_MESSAGE_KEY,
-  REPLY_AS_NEW_TOPIC_KEY,
-  REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
+  NEW_TOPIC_KEY
 });
 
 export default Composer;
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index a84291b46c..b80b8fe08f 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -82,7 +82,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
         action: Composer.PRIVATE_MESSAGE,
         usernames: recipient,
         archetypeId: "private_message",
-        draftKey: "new_private_message",
+        draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
         reply,
         title
       });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
index 2596727a6a..56e0099438 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
@@ -1,4 +1,5 @@
 import Draft from "discourse/models/draft";
+import Composer from "discourse/models/composer";
 
 export default Discourse.Route.extend({
   renderTemplate() {
@@ -17,7 +18,7 @@ export default Discourse.Route.extend({
         if (data.draft) {
           composerController.open({
             draft: data.draft,
-            draftKey: "new_private_message",
+            draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
             ignoreIfChanged: true,
             draftSequence: data.draft_sequence
           });
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
index 6eb09fb77b..328fad5da9 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -5,8 +5,7 @@ import {
   CREATE_TOPIC,
   CREATE_SHARED_DRAFT,
   REPLY,
-  EDIT,
-  NEW_PRIVATE_MESSAGE_KEY
+  EDIT
 } from "discourse/models/composer";
 
 // Component can get destroyed and lose state
@@ -209,7 +208,6 @@ export default DropdownSelectBoxComponent.extend({
 
   _replyFromExisting(options, post, topic) {
     this.closeComposer();
-
     this.openComposer(options, post, topic);
   },
 
@@ -244,6 +242,7 @@ export default DropdownSelectBoxComponent.extend({
     options.action = CREATE_TOPIC;
     options.categoryId = this.get("composerModel.topic.category.id");
     options.disableScopedCategory = true;
+    options.skipDraftCheck = true;
     this._replyFromExisting(options, _postSnapshot, _topicSnapshot);
   },
 
@@ -269,7 +268,7 @@ export default DropdownSelectBoxComponent.extend({
     options.action = PRIVATE_MESSAGE;
     options.usernames = usernames;
     options.archetypeId = "private_message";
-    options.draftKey = NEW_PRIVATE_MESSAGE_KEY;
+    options.skipDraftCheck = true;
 
     this._replyFromExisting(options, _postSnapshot, _topicSnapshot);
   },
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index cdc458f4a0..471a7f78de 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2444,6 +2444,12 @@ en:
         attachment_upload_not_allowed_for_new_user: "Sorry, new users can not upload attachments."
         attachment_download_requires_login: "Sorry, you need to be logged in to download attachments."
 
+      abandon_edit:
+        confirm: "Are you sure you want to discard your changes?"
+        no_value: "No, keep"
+        no_save_draft: "No, save draft"
+        yes_value: "Yes, discard edit"
+
       abandon:
         confirm: "Are you sure you want to abandon your post?"
         no_value: "No, keep"

From 8f51445e9fa5cb94e96ed8866e7e0126a2b14597 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 21 Oct 2019 09:24:14 +0200
Subject: [PATCH 100/328] FIX: fixes plugin generator with zeitwerk (#8220)

---
 lib/generators/plugin/plugin_generator.rb     | 2 +-
 lib/generators/plugin/templates/routes.rb.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generators/plugin/plugin_generator.rb b/lib/generators/plugin/plugin_generator.rb
index 9eb71d0567..6f7a2b2011 100644
--- a/lib/generators/plugin/plugin_generator.rb
+++ b/lib/generators/plugin/plugin_generator.rb
@@ -29,7 +29,7 @@ class PluginGenerator < Rails::Generators::NamedBase
   end
 
   def controller_file
-    template 'plugin_controller.rb.erb', File.join('plugins', dasherized_name, "app/controllers/#{dasherized_name}/#{underscored_name}_controller.rb")
+    template 'plugin_controller.rb.erb', File.join('plugins', dasherized_name, "app/controllers/#{underscored_name}/#{underscored_name}_controller.rb")
     template 'controller.rb.erb', File.join('plugins', dasherized_name, "app/controllers/#{underscored_name}/actions_controller.rb")
     template 'controller_spec.rb.erb', File.join('plugins', dasherized_name, "spec/requests/actions_controller_spec.rb")
   end
diff --git a/lib/generators/plugin/templates/routes.rb.erb b/lib/generators/plugin/templates/routes.rb.erb
index 5a4d6c6d9a..4f31f596ce 100644
--- a/lib/generators/plugin/templates/routes.rb.erb
+++ b/lib/generators/plugin/templates/routes.rb.erb
@@ -1,7 +1,7 @@
 require_dependency "<%= underscored_name %>_constraint"
 
 <%= classified_name %>::Engine.routes.draw do
-  get "/" => "<%= dasherized_name %>#index", constraints: <%= classified_name %>Constraint.new
+  get "/" => "<%= underscored_name %>#index", constraints: <%= classified_name %>Constraint.new
   get "/actions" => "actions#index", constraints: <%= classified_name %>Constraint.new
   get "/actions/:id" => "actions#show", constraints: <%= classified_name %>Constraint.new
 end

From 72822aa93ff2ea46cb0da020eb76cde48d92e8d7 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 21 Oct 2019 09:42:19 +0200
Subject: [PATCH 101/328] FIX: d-button should default type to button (#8217)

This will prevent unexpected behaviour of  d-button being considered as a submit button.
---
 app/assets/javascripts/discourse/components/d-button.js.es6 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index 2665e6e83b..950ddcff30 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -7,6 +7,8 @@ export default Ember.Component.extend({
 
   form: null,
 
+  type: "button",
+
   tagName: "button",
   classNameBindings: [":btn", "noText", "btnType"],
   attributeBindings: [

From 55a139434214a8decc856b192899e53b335873db Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 21 Oct 2019 11:32:27 +0100
Subject: [PATCH 102/328] DEV: pluck_first

Doing .pluck(:column).first is a very common pattern in Discourse and in
most cases, a limit cause isn't being added. Instead of adding a limit
clause to all these callsites, this commit adds two new methods to
ActiveRecord::Relation:

pluck_first, equivalent to limit(1).pluck(*columns).first

and pluck_first! which, like other finder methods, raises an exception
when no record is found
---
 app/controllers/directory_items_controller.rb |  2 +-
 app/controllers/list_controller.rb            |  2 +-
 app/controllers/stylesheets_controller.rb     |  4 +--
 .../theme_javascripts_controller.rb           |  4 +--
 app/controllers/topics_controller.rb          |  2 +-
 app/controllers/user_badges_controller.rb     |  2 +-
 app/helpers/application_helper.rb             |  2 +-
 app/jobs/regular/update_username.rb           |  2 +-
 app/mailers/user_notifications.rb             |  4 +--
 app/models/application_request.rb             |  2 +-
 app/models/backup_metadata.rb                 |  2 +-
 app/models/category.rb                        |  4 +--
 app/models/concerns/cached_counting.rb        |  2 +-
 app/models/draft.rb                           |  4 +--
 app/models/incoming_link.rb                   |  2 +-
 app/models/notification.rb                    |  2 +-
 app/models/post.rb                            |  2 +-
 app/models/post_action.rb                     |  2 +-
 app/models/quoted_post.rb                     |  2 +-
 app/models/topic.rb                           |  2 +-
 app/models/topic_converter.rb                 |  2 +-
 app/models/topic_embed.rb                     |  4 +--
 app/models/topic_user.rb                      |  2 +-
 app/models/user.rb                            |  8 ++---
 app/models/user_action.rb                     |  2 +-
 app/services/post_alerter.rb                  |  2 +-
 lib/composer_messages_finder.rb               |  2 +-
 lib/file_store/s3_store.rb                    |  2 +-
 lib/freedom_patches/pluck_first.rb            | 19 ++++++++++++
 lib/post_creator.rb                           |  2 +-
 lib/search.rb                                 | 10 +++----
 lib/tasks/posts.rake                          |  2 +-
 lib/topic_query.rb                            |  6 ++--
 lib/topic_view.rb                             |  6 ++--
 .../max_username_length_validator.rb          |  2 +-
 .../min_username_length_validator.rb          |  2 +-
 lib/wizard.rb                                 |  2 +-
 script/micro_bench.rb                         |  4 +--
 spec/components/wizard/step_updater_spec.rb   | 12 ++++----
 spec/models/post_action_spec.rb               |  4 +--
 spec/models/top_topic_spec.rb                 | 30 +++++++++----------
 spec/services/post_alerter_spec.rb            |  2 +-
 spec/services/user_merger_spec.rb             |  2 +-
 43 files changed, 99 insertions(+), 80 deletions(-)
 create mode 100644 lib/freedom_patches/pluck_first.rb

diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 8a0ce35fd2..e6d6ea4b3c 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -47,7 +47,7 @@ class DirectoryItemsController < ApplicationController
     end
 
     if params[:username]
-      user_id = User.where(username_lower: params[:username].to_s.downcase).pluck(:id).first
+      user_id = User.where(username_lower: params[:username].to_s.downcase).pluck_first(:id)
       if user_id
         result = result.where(user_id: user_id)
       else
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 312b721fb8..7a3caaabdf 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -410,7 +410,7 @@ class ListController < ApplicationController
   end
 
   def self.best_period_for(previous_visit_at, category_id = nil)
-    default_period = ((category_id && Category.where(id: category_id).pluck(:default_top_period).first) ||
+    default_period = ((category_id && Category.where(id: category_id).pluck_first(:default_top_period)) ||
           SiteSetting.top_page_default_timeframe).to_sym
 
     best_period_with_topics_for(previous_visit_at, category_id, default_period) || default_period
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index e5474da2dd..b986de1e3c 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -61,7 +61,7 @@ class StylesheetsController < ApplicationController
     cache_path = "#{Rails.root}/#{Stylesheet::Manager::CACHE_PATH}"
     location = "#{cache_path}/#{target}#{underscore_digest}#{extension}"
 
-    stylesheet_time = query.pluck(:created_at).first
+    stylesheet_time = query.pluck_first(:created_at)
 
     if !stylesheet_time
       handle_missing_cache(location, target, digest)
@@ -72,7 +72,7 @@ class StylesheetsController < ApplicationController
     end
 
     unless File.exist?(location)
-      if current = query.limit(1).pluck(source_map ? :source_map : :content).first
+      if current = query.pluck_first(source_map ? :source_map : :content)
         FileUtils.mkdir_p(cache_path)
         File.write(location, current)
       else
diff --git a/app/controllers/theme_javascripts_controller.rb b/app/controllers/theme_javascripts_controller.rb
index cfa48dca0c..0fb5f526a5 100644
--- a/app/controllers/theme_javascripts_controller.rb
+++ b/app/controllers/theme_javascripts_controller.rb
@@ -21,7 +21,7 @@ class ThemeJavascriptsController < ApplicationController
     cache_file = "#{DISK_CACHE_PATH}/#{params[:digest]}.js"
 
     unless File.exist?(cache_file)
-      content = query.pluck(:content).first
+      content = query.pluck_first(:content)
       raise Discourse::NotFound if content.nil?
 
       FileUtils.mkdir_p(DISK_CACHE_PATH)
@@ -41,7 +41,7 @@ class ThemeJavascriptsController < ApplicationController
   end
 
   def last_modified
-    @last_modified ||= query.pluck(:updated_at).first
+    @last_modified ||= query.pluck_first(:updated_at)
   end
 
   def not_modified?
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 1b2bc12702..7e50ec7400 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -711,7 +711,7 @@ class TopicsController < ApplicationController
     guardian.ensure_can_move_posts!(topic)
 
     # when creating a new topic, ensure the 1st post is a regular post
-    if params[:title].present? && Post.where(topic: topic, id: post_ids).order(:post_number).pluck(:post_type).first != Post.types[:regular]
+    if params[:title].present? && Post.where(topic: topic, id: post_ids).order(:post_number).pluck_first(:post_type) != Post.types[:regular]
       return render_json_error("When moving posts to a new topic, the first post must be a regular post.")
     end
 
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index fe306f65ff..ddb5a3e8ae 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -13,7 +13,7 @@ class UserBadgesController < ApplicationController
     grant_count = nil
 
     if params[:username]
-      user_id = User.where(username_lower: params[:username].downcase).pluck(:id).first
+      user_id = User.where(username_lower: params[:username].downcase).pluck_first(:id)
       user_badges = user_badges.where(user_id: user_id) if user_id
       grant_count = badge.user_badges.where(user_id: user_id).count
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 84d8e383b5..96531a9a18 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,7 +127,7 @@ module ApplicationHelper
 
     if current_user.present? &&
         current_user.primary_group_id &&
-        primary_group_name = Group.where(id: current_user.primary_group_id).pluck(:name).first
+        primary_group_name = Group.where(id: current_user.primary_group_id).pluck_first(:name)
       result << "primary-group-#{primary_group_name.downcase}"
     end
 
diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index 308dc75c99..3295fd0800 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -184,7 +184,7 @@ module Jobs
       Post.where(
         topic_id: aside["data-topic"],
         post_number: aside["data-post"]
-      ).pluck(:user_id).first == @user_id
+      ).pluck_first(:user_id) == @user_id
     end
   end
 end
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index bdf9c85698..a3450b00d6 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -395,7 +395,7 @@ class UserNotifications < ActionMailer::Base
     user_name = notification_data[:original_username]
 
     if post && SiteSetting.enable_names && SiteSetting.display_name_on_email_from
-      name = User.where(id: post.user_id).pluck(:name).first
+      name = User.where(id: post.user_id).pluck_first(:name)
       user_name = name unless name.blank?
     end
 
@@ -476,7 +476,7 @@ class UserNotifications < ActionMailer::Base
 
       # subcategory case
       if !category.parent_category_id.nil?
-        show_category_in_subject = "#{Category.where(id: category.parent_category_id).pluck(:name).first}/#{show_category_in_subject}"
+        show_category_in_subject = "#{Category.where(id: category.parent_category_id).pluck_first(:name)}/#{show_category_in_subject}"
       end
     else
       show_category_in_subject = nil
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index 1e4459f681..2447501445 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -63,7 +63,7 @@ class ApplicationRequest < ActiveRecord::Base
     req_type_id = req_types[req_type]
 
     # a poor man's upsert
-    id = where(date: date, req_type: req_type_id).pluck(:id).first
+    id = where(date: date, req_type: req_type_id).pluck_first(:id)
     id ||= create!(date: date, req_type: req_type_id, count: 0).id
 
   rescue # primary key violation
diff --git a/app/models/backup_metadata.rb b/app/models/backup_metadata.rb
index 6cddb82576..db4bf7e9ad 100644
--- a/app/models/backup_metadata.rb
+++ b/app/models/backup_metadata.rb
@@ -2,7 +2,7 @@
 
 class BackupMetadata < ActiveRecord::Base
   def self.value_for(name)
-    where(name: name).pluck(:value).first.presence
+    where(name: name).pluck_first(:value).presence
   end
 end
 
diff --git a/app/models/category.rb b/app/models/category.rb
index d3273ea63d..40f5791090 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -608,8 +608,8 @@ class Category < ActiveRecord::Base
 
   def self.query_parent_category(parent_slug)
     encoded_parent_slug = CGI.escape(parent_slug) if SiteSetting.slug_generation_method == 'encoded'
-    self.where(slug: (encoded_parent_slug || parent_slug), parent_category_id: nil).pluck(:id).first ||
-    self.where(id: parent_slug.to_i).pluck(:id).first
+    self.where(slug: (encoded_parent_slug || parent_slug), parent_category_id: nil).pluck_first(:id) ||
+    self.where(id: parent_slug.to_i).pluck_first(:id)
   end
 
   def self.query_category(slug_or_id, parent_category_id)
diff --git a/app/models/concerns/cached_counting.rb b/app/models/concerns/cached_counting.rb
index 3c3b09cd40..4430126ced 100644
--- a/app/models/concerns/cached_counting.rb
+++ b/app/models/concerns/cached_counting.rb
@@ -58,7 +58,7 @@ module CachedCounting
     end
 
     def request_id(query_params, retries = 0)
-      id = where(query_params).pluck(:id).first
+      id = where(query_params).pluck_first(:id)
       id ||= create!(query_params.merge(count: 0)).id
     rescue # primary key violation
       if retries == 0
diff --git a/app/models/draft.rb b/app/models/draft.rb
index f05cb8b7fe..c31186cf57 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -104,7 +104,7 @@ class Draft < ActiveRecord::Base
     reply = JSON.parse(data)["reply"] || ""
     return if reply.length < SiteSetting.backup_drafts_to_pm_length
 
-    post_id = BackupDraftPost.where(user_id: user.id, key: key).pluck(:post_id).first
+    post_id = BackupDraftPost.where(user_id: user.id, key: key).pluck_first(:post_id)
     post = Post.where(id: post_id).first if post_id
 
     if post_id && !post
@@ -159,7 +159,7 @@ class Draft < ActiveRecord::Base
   end
 
   def self.ensure_draft_topic!(user)
-    topic_id = BackupDraftTopic.where(user_id: user.id).pluck(:topic_id).first
+    topic_id = BackupDraftTopic.where(user_id: user.id).pluck_first(:topic_id)
     topic = Topic.find_by(id: topic_id) if topic_id
 
     if topic_id && !topic
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index d595eea04d..4e51a66823 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -39,7 +39,7 @@ class IncomingLink < ActiveRecord::Base
       post_id = opts[:post_id]
       post_id ||= Post.where(topic_id: opts[:topic_id],
                              post_number: opts[:post_number] || 1)
-        .pluck(:id).first
+        .pluck_first(:id)
 
       cid = current_user ? (current_user.id) : (nil)
       ip_address = nil if cid
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 9b32cae7c0..6a4413e7f5 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -211,7 +211,7 @@ class Notification < ActiveRecord::Base
   end
 
   def post_id
-    Post.where(topic: topic_id, post_number: post_number).pluck(:id).first
+    Post.where(topic: topic_id, post_number: post_number).pluck_first(:id)
   end
 
   protected
diff --git a/app/models/post.rb b/app/models/post.rb
index 34d8d24e45..2462b5abb6 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -983,7 +983,7 @@ class Post < ActiveRecord::Base
             end
 
             upload_id = nil
-            upload_id = Upload.where(sha1: sha1).pluck(:id).first if sha1.present?
+            upload_id = Upload.where(sha1: sha1).pluck_first(:id) if sha1.present?
             upload_id ||= yield(post, src, path, sha1)
 
             if upload_id.blank?
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 5affd3b809..077ef253c1 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -215,7 +215,7 @@ class PostAction < ActiveRecord::Base
       end
     end
 
-    topic_id = Post.with_deleted.where(id: post_id).pluck(:topic_id).first
+    topic_id = Post.with_deleted.where(id: post_id).pluck_first(:topic_id)
 
     # topic_user
     if [:like, :bookmark].include? post_action_type_key
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index ad07877ac8..03b981e1fb 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -67,7 +67,7 @@ class QuotedPost < ActiveRecord::Base
     reply_quoted = false
 
     if post.reply_to_post_number
-      reply_post_id = Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number).pluck(:id).first
+      reply_post_id = Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number).pluck_first(:id)
       reply_quoted = reply_post_id.present? && QuotedPost.where(post_id: post.id, quoted_post_id: reply_post_id).count > 0
     end
 
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 9061198bab..85cff4f7e3 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -607,7 +607,7 @@ class Topic < ActiveRecord::Base
 
   # If a post is deleted we have to update our highest post counters
   def self.reset_highest(topic_id)
-    archetype = Topic.where(id: topic_id).pluck(:archetype).first
+    archetype = Topic.where(id: topic_id).pluck_first(:archetype)
 
     # ignore small_action replies for private messages
     post_type = archetype == Archetype.private_message ? " AND post_type <> #{Post.types[:small_action]}" : ''
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index aa23da10ad..650333749d 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -20,7 +20,7 @@ class TopicConverter
           Category.where(read_restricted: false)
             .where.not(id: SiteSetting.uncategorized_category_id)
             .order('id asc')
-            .pluck(:id).first
+            .pluck_first(:id)
         end
 
       PostRevisor.new(@topic.first_post, @topic).revise!(
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 895f0d5986..a18e34c3ad 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -208,7 +208,7 @@ class TopicEmbed < ActiveRecord::Base
 
   def self.topic_id_for_embed(embed_url)
     embed_url = normalize_url(embed_url).sub(/^https?\:\/\//, '')
-    TopicEmbed.where("embed_url ~* ?", "^https?://#{Regexp.escape(embed_url)}$").pluck(:topic_id).first
+    TopicEmbed.where("embed_url ~* ?", "^https?://#{Regexp.escape(embed_url)}$").pluck_first(:topic_id)
   end
 
   def self.first_paragraph_from(html)
@@ -229,7 +229,7 @@ class TopicEmbed < ActiveRecord::Base
 
   def self.expanded_for(post)
     Rails.cache.fetch("embed-topic:#{post.topic_id}", expires_in: 10.minutes) do
-      url = TopicEmbed.where(topic_id: post.topic_id).pluck(:embed_url).first
+      url = TopicEmbed.where(topic_id: post.topic_id).pluck_first(:embed_url)
       response = TopicEmbed.find_remote(url)
 
       body = response.body
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 65df38666f..5c43a6e728 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -215,7 +215,7 @@ class TopicUser < ActiveRecord::Base
             attrs[:notification_level] = notification_levels[:watching]
           end
         else
-          auto_track_after = UserOption.where(user_id: user_id).pluck(:auto_track_topics_after_msecs).first
+          auto_track_after = UserOption.where(user_id: user_id).pluck_first(:auto_track_topics_after_msecs)
           auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
 
           if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
diff --git a/app/models/user.rb b/app/models/user.rb
index 337748b75a..2a8a55f595 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -199,7 +199,7 @@ class User < ActiveRecord::Base
   scope :filter_by_username_or_email, ->(filter) do
     if filter =~ /.+@.+/
       # probably an email so try the bypass
-      if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck(:user_id).first
+      if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck_first(:user_id)
         return where('users.id = ?', user_id)
       end
     end
@@ -1219,11 +1219,11 @@ class User < ActiveRecord::Base
     group_titles_query = group_titles_query.order("groups.id = #{primary_group_id} DESC") if primary_group_id
     group_titles_query = group_titles_query.order("groups.primary_group DESC").limit(1)
 
-    if next_best_group_title = group_titles_query.pluck(:title).first
+    if next_best_group_title = group_titles_query.pluck_first(:title)
       return next_best_group_title
     end
 
-    next_best_badge_title = badges.where(allow_title: true).limit(1).pluck(:name).first
+    next_best_badge_title = badges.where(allow_title: true).pluck_first(:name)
     next_best_badge_title ? Badge.display_name(next_best_badge_title) : nil
   end
 
@@ -1444,7 +1444,7 @@ class User < ActiveRecord::Base
   def match_title_to_primary_group_changes
     return unless primary_group_id_changed?
 
-    if title == Group.where(id: primary_group_id_was).pluck(:title).first
+    if title == Group.where(id: primary_group_id_was).pluck_first(:title)
       self.title = primary_group&.title
     end
   end
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index df79c89be4..fef91feb9e 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -46,7 +46,7 @@ class UserAction < ActiveRecord::Base
   def self.last_action_in_topic(user_id, topic_id)
     UserAction.where(user_id: user_id,
                      target_topic_id: topic_id,
-                     action_type: [RESPONSE, MENTION, QUOTE]).order('created_at DESC').pluck(:target_post_id).first
+                     action_type: [RESPONSE, MENTION, QUOTE]).order('created_at DESC').pluck_first(:target_post_id)
   end
 
   def self.stats(user_id, guardian)
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index bcf1f05385..d71e4b4914 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -221,7 +221,7 @@ class PostAlerter
     group_id = post.topic
       .topic_allowed_groups
       .where(group_id: user.groups.pluck(:id))
-      .pluck(:group_id).first
+      .pluck_first(:group_id)
 
     stat = stats.find { |s| s[:group_id] == group_id }
     return unless stat && stat[:inbox_count] > 0
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index b91fceffc3..f1f9aa33d8 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -170,7 +170,7 @@ class ComposerMessagesFinder
                         target_user_id: @user.id,
                         topic_id: @details[:topic_id])
 
-    reply_username = User.where(id: last_x_replies[0]).pluck(:username).first
+    reply_username = User.where(id: last_x_replies[0]).pluck_first(:username)
 
     {
       id: 'get_a_room',
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 0c983607a4..2b1cc0a83c 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -197,7 +197,7 @@ module FileStore
         verified_ids = []
 
         files.each do |f|
-          id = model.where("url LIKE '%#{f.key}' AND etag = '#{f.etag}'").pluck(:id).first
+          id = model.where("url LIKE '%#{f.key}' AND etag = '#{f.etag}'").pluck_first(:id)
           verified_ids << id if id.present?
           marker = f.key
         end
diff --git a/lib/freedom_patches/pluck_first.rb b/lib/freedom_patches/pluck_first.rb
new file mode 100644
index 0000000000..6f3d520187
--- /dev/null
+++ b/lib/freedom_patches/pluck_first.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ActiveRecord::Relation
+  def pluck_first(*attributes)
+    limit(1).pluck(*attributes).first
+  end
+
+  def pluck_first!(*attributes)
+    items = limit(1).pluck(*attributes)
+
+    raise_record_not_found_exception! if items.empty?
+
+    items.first
+  end
+end
+
+module ActiveRecord::Querying
+  delegate(:pluck_first, :pluck_first!, to: :all)
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 561720dfb0..bb00ba335f 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -298,7 +298,7 @@ class PostCreator
       sequence = DraftSequence.current(@user, draft_key)
       revisions = Draft.where(sequence: sequence,
                               user_id: @user.id,
-                              draft_key: draft_key).pluck(:revisions).first || 0
+                              draft_key: draft_key).pluck_first(:revisions) || 0
 
       @post.build_post_stat(
         drafts_saved: revisions,
diff --git a/lib/search.rb b/lib/search.rb
index 7eba399d14..1f618cd56f 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -344,7 +344,7 @@ class Search
   end
 
   advanced_filter(/^badge:(.*)$/) do |posts, match|
-    badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first
+    badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck_first(:id)
     if badge_id
       posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id)
     else
@@ -481,7 +481,7 @@ class Search
       posts.where("topics.category_id IN (?)", category_ids)
     else
       # try a possible tag match
-      tag_id = Tag.where_name(category_slug).pluck(:id).first
+      tag_id = Tag.where_name(category_slug).pluck_first(:id)
       if (tag_id)
         posts.where(<<~SQL, tag_id)
           topics.id IN (
@@ -517,7 +517,7 @@ class Search
   end
 
   advanced_filter(/^group:(.+)$/) do |posts, match|
-    group_id = Group.where('name ilike ? OR (id = ? AND id > 0)', match, match.to_i).pluck(:id).first
+    group_id = Group.where('name ilike ? OR (id = ? AND id > 0)', match, match.to_i).pluck_first(:id)
     if group_id
       posts.where("posts.user_id IN (select gu.user_id from group_users gu where gu.group_id = ?)", group_id)
     else
@@ -526,7 +526,7 @@ class Search
   end
 
   advanced_filter(/^user:(.+)$/) do |posts, match|
-    user_id = User.where(staged: false).where('username_lower = ? OR id = ?', match.downcase, match.to_i).pluck(:id).first
+    user_id = User.where(staged: false).where('username_lower = ? OR id = ?', match.downcase, match.to_i).pluck_first(:id)
     if user_id
       posts.where("posts.user_id = #{user_id}")
     else
@@ -535,7 +535,7 @@ class Search
   end
 
   advanced_filter(/^\@([a-zA-Z0-9_\-.]+)$/) do |posts, match|
-    user_id = User.where(staged: false).where(username_lower: match.downcase).pluck(:id).first
+    user_id = User.where(staged: false).where(username_lower: match.downcase).pluck_first(:id)
     if user_id
       posts.where("posts.user_id = #{user_id}")
     else
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index fec5a4f007..0515f4301b 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -533,7 +533,7 @@ def recover_uploads_from_index(path)
 
   PostCustomField.where(name: Post::MISSING_UPLOADS).pluck(:post_id, :value).each do |post_id, uploads|
     uploads = JSON.parse(uploads)
-    raw = Post.where(id: post_id).pluck(:raw).first
+    raw = Post.where(id: post_id).pluck_first(:raw)
     uploads.map! do |upload|
       orig = upload
       if raw.scan(upload).length == 0
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 991ed94dfb..1982ed133e 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -350,7 +350,7 @@ class TopicQuery
 
   def list_private_messages_group_archive(user)
     list = private_messages_for(user, :group)
-    group_id = Group.where('name ilike ?', @options[:group_name]).pluck(:id).first
+    group_id = Group.where('name ilike ?', @options[:group_name]).pluck_first(:id)
     list = list.joins("JOIN group_archived_messages gm ON gm.topic_id = topics.id AND
                       gm.group_id = #{group_id.to_i}")
     create_list(:private_messages, {}, list)
@@ -642,7 +642,7 @@ class TopicQuery
   def get_category_id(category_id_or_slug)
     return nil unless category_id_or_slug
     category_id = category_id_or_slug.to_i
-    category_id = Category.where(slug: category_id_or_slug).pluck(:id).first if category_id == 0
+    category_id = Category.where(slug: category_id_or_slug).pluck_first(:id) if category_id == 0
     category_id
   end
 
@@ -685,7 +685,7 @@ class TopicQuery
 
       if !@options[:order]
         # category default sort order
-        sort_order, sort_ascending = Category.where(id: category_id).pluck(:sort_order, :sort_ascending).first
+        sort_order, sort_ascending = Category.where(id: category_id).pluck_first(:sort_order, :sort_ascending)
         if sort_order
           options[:order] = sort_order
           options[:ascending] = !!sort_ascending ? 'true' : 'false'
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index c93461e035..aaa4ccc086 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -566,7 +566,7 @@ class TopicView
   end
 
   def filtered_post_id(post_number)
-    @filtered_posts.where(post_number: post_number).pluck(:id).first
+    @filtered_posts.where(post_number: post_number).pluck_first(:id)
   end
 
   def is_mega_topic?
@@ -574,11 +574,11 @@ class TopicView
   end
 
   def first_post_id
-    @filtered_posts.order(sort_order: :asc).limit(1).pluck(:id).first
+    @filtered_posts.order(sort_order: :asc).pluck_first(:id)
   end
 
   def last_post_id
-    @filtered_posts.order(sort_order: :desc).limit(1).pluck(:id).first
+    @filtered_posts.order(sort_order: :desc).pluck_first(:id)
   end
 
   def current_post_number
diff --git a/lib/validators/max_username_length_validator.rb b/lib/validators/max_username_length_validator.rb
index c871cc3242..bce5a648d1 100644
--- a/lib/validators/max_username_length_validator.rb
+++ b/lib/validators/max_username_length_validator.rb
@@ -7,7 +7,7 @@ class MaxUsernameLengthValidator
 
   def valid_value?(value)
     return false if value < SiteSetting.min_username_length
-    @username = User.where('length(username) > ?', value).pluck(:username).first
+    @username = User.where('length(username) > ?', value).pluck_first(:username)
     @username.blank?
   end
 
diff --git a/lib/validators/min_username_length_validator.rb b/lib/validators/min_username_length_validator.rb
index 1c4dca7e7d..0e1fe936a8 100644
--- a/lib/validators/min_username_length_validator.rb
+++ b/lib/validators/min_username_length_validator.rb
@@ -7,7 +7,7 @@ class MinUsernameLengthValidator
 
   def valid_value?(value)
     return false if value > SiteSetting.max_username_length
-    @username = User.where('length(username) < ?', value).pluck(:username).first
+    @username = User.where('length(username) < ?', value).pluck_first(:username)
     @username.blank?
   end
 
diff --git a/lib/wizard.rb b/lib/wizard.rb
index dbf4d8967e..a254d8935d 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -87,7 +87,7 @@ class Wizard
       .human_users
       .joins(:user_auth_tokens)
       .order('user_auth_tokens.created_at')
-      .pluck(:id).first
+      .pluck_first(:id)
 
     if @user&.id && first_admin_id == @user.id
       !Wizard::Builder.new(@user).build.completed?
diff --git a/script/micro_bench.rb b/script/micro_bench.rb
index d78d057b00..741d936428 100644
--- a/script/micro_bench.rb
+++ b/script/micro_bench.rb
@@ -15,11 +15,11 @@ Benchmark.ips do |b|
   end
 
   b.report("pluck with first") do
-    User.pluck(:name).first
+    User.pluck_first(:name)
   end
 
   b.report("pluck with limit") do
-    User.limit(1).pluck(:name).first
+    User.pluck_first(:name)
   end
 
   b.report("raw") do
diff --git a/spec/components/wizard/step_updater_spec.rb b/spec/components/wizard/step_updater_spec.rb
index 5c2fee8555..13d816b606 100644
--- a/spec/components/wizard/step_updater_spec.rb
+++ b/spec/components/wizard/step_updater_spec.rb
@@ -98,19 +98,19 @@ describe Wizard::StepUpdater do
       expect(SiteSetting.site_contact_username).to eq(user.username)
 
       # Should update the TOS topic
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck(:raw).first
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
       expect(raw).to eq("<eviltrout@example.com> template")
 
       # Can update the TOS topic again
       updater = wizard.create_updater('contact', contact_email: 'alice@example.com')
       updater.update
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck(:raw).first
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
       expect(raw).to eq("<alice@example.com> template")
 
       # Can update the TOS to nothing
       updater = wizard.create_updater('contact', {})
       updater.update
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck(:raw).first
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
       expect(raw).to eq("<contact_email> template")
 
       expect(wizard.completed_steps?('contact')).to eq(true)
@@ -145,7 +145,7 @@ describe Wizard::StepUpdater do
       expect(SiteSetting.city_for_disputes).to eq("Fairfield, New Jersey")
 
       # Should update the TOS topic
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck(:raw).first
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
       expect(raw).to eq("ACME, Inc. - New Jersey law - Fairfield, New Jersey template")
 
       # Can update the TOS topic again
@@ -154,13 +154,13 @@ describe Wizard::StepUpdater do
                                       governing_law: 'California law',
                                       city_for_disputes: 'San Francisco, California')
       updater.update
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck(:raw).first
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
       expect(raw).to eq("Pied Piper Inc - California law - San Francisco, California template")
 
       # Can update the TOS to nothing
       updater = wizard.create_updater('corporate', {})
       updater.update
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck(:raw).first
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
       expect(raw).to eq("company_name - governing_law - city_for_disputes template")
 
       expect(wizard.completed_steps?('corporate')).to eq(true)
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 4f477e02c0..3413cb273a 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -54,10 +54,10 @@ describe PostAction do
       expect(topic_user_ids).to include(mod.id)
 
       expect(topic.topic_users.where(user_id: mod.id)
-              .pluck(:notification_level).first).to eq(TopicUser.notification_levels[:tracking])
+              .pluck_first(:notification_level)).to eq(TopicUser.notification_levels[:tracking])
 
       expect(topic.topic_users.where(user_id: codinghorror.id)
-              .pluck(:notification_level).first).to eq(TopicUser.notification_levels[:watching])
+              .pluck_first(:notification_level)).to eq(TopicUser.notification_levels[:watching])
 
       # reply to PM should not clear flag
       PostCreator.new(mod, topic_id: posts[0].topic_id, raw: "This is my test reply to the user, it should clear flags").create
diff --git a/spec/models/top_topic_spec.rb b/spec/models/top_topic_spec.rb
index 720b392900..33fc873a1a 100644
--- a/spec/models/top_topic_spec.rb
+++ b/spec/models/top_topic_spec.rb
@@ -72,9 +72,9 @@ describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck(:yearly_score).first).to eq(27)
-      expect(top_topics.where(topic_id: topic_2.id).pluck(:yearly_score).first).to be_within(0.0000000001).of(18.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck(:yearly_score).first).to be_within(0.0000000001).of(10.602059991328)
+      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
+      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(18.301029995664)
+      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(10.602059991328)
 
       # when 'top_topics_formula_log_views_multiplier' setting is changed
       SiteSetting.top_topics_formula_log_views_multiplier = 4
@@ -90,9 +90,9 @@ describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck(:yearly_score).first).to eq(27)
-      expect(top_topics.where(topic_id: topic_2.id).pluck(:yearly_score).first).to eq(18.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck(:yearly_score).first).to eq(11.2041199826559)
+      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
+      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to eq(18.301029995664)
+      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to eq(11.2041199826559)
 
       # when 'top_topics_formula_first_post_likes_multiplier' setting is changed
       SiteSetting.top_topics_formula_log_views_multiplier = 2 # unchanged
@@ -108,9 +108,9 @@ describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck(:yearly_score).first).to eq(69)
-      expect(top_topics.where(topic_id: topic_2.id).pluck(:yearly_score).first).to eq(33.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck(:yearly_score).first).to eq(10.602059991328)
+      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(69)
+      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to eq(33.301029995664)
+      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to eq(10.602059991328)
 
       # when 'top_topics_formula_least_likes_per_post_multiplier' setting is changed
       SiteSetting.top_topics_formula_log_views_multiplier = 2 # unchanged
@@ -126,9 +126,9 @@ describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck(:yearly_score).first).to eq(30)
-      expect(top_topics.where(topic_id: topic_2.id).pluck(:yearly_score).first).to eq(21.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck(:yearly_score).first).to eq(10.602059991328)
+      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(30)
+      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to eq(21.301029995664)
+      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to eq(10.602059991328)
 
       # handles invalid string value
       SiteSetting.top_topics_formula_log_views_multiplier = "not good"
@@ -138,9 +138,9 @@ describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck(:yearly_score).first).to eq(27)
-      expect(top_topics.where(topic_id: topic_2.id).pluck(:yearly_score).first).to eq(18.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck(:yearly_score).first).to eq(10.602059991328)
+      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
+      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to eq(18.301029995664)
+      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to eq(10.602059991328)
 
     end
   end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index d8e38e7773..dd7cc23415 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -49,7 +49,7 @@ describe PostAlerter do
       PostAlerter.post_created(reply2)
 
       # we get a green notification for a reply
-      expect(Notification.where(user_id: pm.user_id).pluck(:notification_type).first).to eq(Notification.types[:private_message])
+      expect(Notification.where(user_id: pm.user_id).pluck_first(:notification_type)).to eq(Notification.types[:private_message])
 
       TopicUser.change(pm.user_id, pm.id, notification_level: TopicUser.notification_levels[:tracking])
 
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
index fcce2e7251..d95e8ca310 100644
--- a/spec/services/user_merger_spec.rb
+++ b/spec/services/user_merger_spec.rb
@@ -228,7 +228,7 @@ describe UserMerger do
     [group1, group2, group3].each do |g|
       owner = [group1, group3].include?(g)
       expect(GroupUser.where(group_id: g.id, user_id: target_user.id, owner: owner).count).to eq(1)
-      expect(Group.where(id: g.id).pluck(:user_count).first).to eq(2)
+      expect(Group.where(id: g.id).pluck_first(:user_count)).to eq(2)
     end
     expect(GroupUser.where(user_id: source_user.id).count).to eq(0)
   end

From 1352a5b5fa716c99c47ac784aa2d64186e17af0e Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 21 Oct 2019 12:21:10 +0100
Subject: [PATCH 103/328] DEV: undo pluck_first changes to micro benchmark

and add pluck_first benchmark
---
 script/micro_bench.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/script/micro_bench.rb b/script/micro_bench.rb
index 741d936428..51ea6c8912 100644
--- a/script/micro_bench.rb
+++ b/script/micro_bench.rb
@@ -15,10 +15,14 @@ Benchmark.ips do |b|
   end
 
   b.report("pluck with first") do
-    User.pluck_first(:name)
+    User.pluck(:name).first
   end
 
   b.report("pluck with limit") do
+    User.limit(1).pluck(:name).first
+  end
+
+  b.report("pluck with pluck_first") do
     User.pluck_first(:name)
   end
 

From 594925b8965a26c512665371092fec3383320b58 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 21 Oct 2019 13:20:38 +0100
Subject: [PATCH 104/328] FIX: id is always true since it's been to_i'd

Let's only look up the category if the id has been provided
---
 app/controllers/list_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 7a3caaabdf..e7c0de86dc 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -360,7 +360,7 @@ class ListController < ApplicationController
     @category = Category.query_category(slug_or_id, parent_category_id)
 
     # Redirect if we have `/c/:parent_category/:category/:id`
-    if id
+    if params.include?(:id)
       category = Category.find_by_id(id)
       (redirect_to category.url, status: 301) && return if category
     end

From 5e55e75aedf84f419eb5e039d076bf492973039e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 21 Oct 2019 17:57:31 +0530
Subject: [PATCH 105/328] FIX: 'only_hidden_tags_changed?' method returned
 'true' even when tags are not changed.

While editing the first post it does't bumped the topic when the new post revision created. Because we wrongly assumed that the hidden tags are changed even when no tags are updated.
---
 lib/post_revisor.rb                  |  7 +++++--
 spec/components/post_revisor_spec.rb | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 02b88d1173..cd68bf7bb0 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -522,14 +522,17 @@ class PostRevisor
   end
 
   def only_hidden_tags_changed?
+    return false if (hidden_tag_names = DiscourseTagging.hidden_tag_names).blank?
+
     modifications = post_changes.merge(@topic_changes.diff)
-    if modifications.keys.size == 1 && tags_diff = modifications["tags"]
+    if modifications.keys.size == 1 && (tags_diff = modifications["tags"]).present?
       a, b = tags_diff[0] || [], tags_diff[1] || []
       changed_tags = ((a + b) - (a & b)).map(&:presence).compact
-      if (changed_tags - DiscourseTagging.hidden_tag_names(nil)).empty?
+      if (changed_tags - hidden_tag_names).empty?
         return true
       end
     end
+
     false
   end
 
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index a47596fe38..598fb686d5 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -190,6 +190,12 @@ describe PostRevisor do
         expect(post.public_version).to eq(1)
         expect(post.revisions.size).to eq(0)
       end
+
+      it "should bump the topic" do
+        expect {
+          subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
+        }.to change { post.topic.bumped_at }
+      end
     end
 
     describe 'revision much later' do
@@ -783,6 +789,13 @@ describe PostRevisor do
               }.to_not change { topic.reload.bumped_at }
             end
 
+            it "should bump topic if non staff-only tags are added" do
+              expect {
+                result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) + [Fabricate(:tag).name])
+                expect(result).to eq(true)
+              }.to change { topic.reload.bumped_at }
+            end
+
             it "creates a hidden revision" do
               subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) + ['secret'])
               expect(post.reload.revisions.first.hidden).to eq(true)

From cc56f226b8aa6791ac2a3e4eaf064df2628f7109 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 21 Oct 2019 14:52:54 +0100
Subject: [PATCH 106/328] FIX: Correct mention autocomplete in new topics in
 unsecured categories

When autocompleting mentions in secure categories, we immediately populate the list with users which have permission to view the category. This logic is applied to unsecured categories as well, but the server returns an empty list of users. This commit teaches the autocomplete to understand empty lists of users without terminating the autocomplete dropdown.
---
 .../discourse/lib/user-search.js.es6          | 24 +++++++++++----
 test/javascripts/lib/user-search-test.js.es6  | 30 +++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index 1cb70232e9..90b3a3d28e 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -26,11 +26,13 @@ function performSearch(
     return;
   }
 
-  // I am not strongly against unconditionally returning
-  // however this allows us to return a list of probable
-  // users we want to mention, early on a topic
-  if (term === "" && !topicId && !categoryId) {
-    return [];
+  const eagerComplete = term === "" && !!(topicId || categoryId);
+
+  if (term === "" && !eagerComplete) {
+    // The server returns no results in this case, so no point checking
+    // do not return empty list, because autocomplete will get terminated
+    resultsFn(CANCELLED_STATUS);
+    return;
   }
 
   // need to be able to cancel this
@@ -51,6 +53,18 @@ function performSearch(
 
   oldSearch
     .then(function(r) {
+      const hasResults = !!(
+        r.users.length ||
+        r.groups.length ||
+        r.emails.length
+      );
+
+      if (eagerComplete && !hasResults) {
+        // we are trying to eager load, but received no results
+        // do not return empty list, because autocomplete will get terminated
+        r = CANCELLED_STATUS;
+      }
+
       cache[term] = r;
       cacheTime = new Date();
       // If there is a newer search term, return null
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index f061c2ec61..5d11b47903 100644
--- a/test/javascripts/lib/user-search-test.js.es6
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -1,4 +1,5 @@
 import userSearch from "discourse/lib/user-search";
+import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 
 QUnit.module("lib:user-search", {
   beforeEach() {
@@ -12,6 +13,9 @@ QUnit.module("lib:user-search", {
       // special responder for per category search
       const categoryMatch = request.url.match(/category_id=([0-9]+)/);
       if (categoryMatch) {
+        if(categoryMatch[1] === "3"){
+          return response({});
+        }
         return response({
           users: [
             {
@@ -92,6 +96,32 @@ QUnit.test("it flushes cache when switching categories", async assert => {
   assert.equal(results.length, 1);
 });
 
+QUnit.test(
+  "it returns cancel when eager completing with no results",
+  async assert => {
+    // Do everything twice, to check the cache works correctly
+
+    for (let i = 0; i < 2; i++) {
+      // No topic or category, will always cancel
+      let result = await userSearch({ term: "" });
+      assert.equal(result, CANCELLED_STATUS);
+    }
+
+    for (let i = 0; i < 2; i++) {
+      // Unsecured category, so has no recommendations
+      let result = await userSearch({ term: "", categoryId: 3 });
+      assert.equal(result, CANCELLED_STATUS);
+    }
+
+    for (let i = 0; i < 2; i++) {
+      // Secured category, will have 1 recommendation
+      let results = await userSearch({ term: "", categoryId: 1 });
+      assert.equal(results[0].username, "category_1");
+      assert.equal(results.length, 1);
+    }
+  }
+);
+
 QUnit.test("it places groups unconditionally for exact match", async assert => {
   let results = await userSearch({ term: "Team" });
   assert.equal(results[results.length - 1]["name"], "team");

From 9dcdbcfd5b2a5a28ca3fd93ea610b4e71eeb8d0d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 21 Oct 2019 11:56:15 -0400
Subject: [PATCH 107/328] Run prettier on the loader

---
 app/assets/javascripts/discourse-loader.js | 128 ++++++++++++---------
 1 file changed, 74 insertions(+), 54 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 3a86a00da1..6809670b93 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,18 +1,21 @@
 var define, requirejs;
 
 (function() {
-
   var MOVED_MODULES = {
-    "discourse/views/list/post-count-or-badges": "discourse/raw-views/list/post-count-or-badges",
-    "discourse/views/list/posts-count-column" : "discourse/raw-views/list/posts-count-column",
-    "discourse/views/list/visited-line" : "discourse/raw-views/list/visited-line",
-    "discourse/views/topic-list-header-column" : "discourse/raw-views/topic-list-header-column",
-    "discourse/views/topic-status" : "discourse/raw-views/topic-status"
+    "discourse/views/list/post-count-or-badges":
+      "discourse/raw-views/list/post-count-or-badges",
+    "discourse/views/list/posts-count-column":
+      "discourse/raw-views/list/posts-count-column",
+    "discourse/views/list/visited-line":
+      "discourse/raw-views/list/visited-line",
+    "discourse/views/topic-list-header-column":
+      "discourse/raw-views/topic-list-header-column",
+    "discourse/views/topic-status": "discourse/raw-views/topic-status"
   };
 
   var _isArray;
   if (!Array.isArray) {
-    _isArray = function (x) {
+    _isArray = function(x) {
       return Object.prototype.toString.call(x) === "[object Array]";
     };
   } else {
@@ -34,28 +37,34 @@ var define, requirejs;
   }
 
   function unsupportedModule(length) {
-    throw new Error("an unsupported module was defined, expected `define(name, deps, module)` instead got: `" + length + "` arguments to define`");
+    throw new Error(
+      "an unsupported module was defined, expected `define(name, deps, module)` instead got: `" +
+        length +
+        "` arguments to define`"
+    );
   }
 
-  var defaultDeps = ['require', 'exports', 'module'];
+  var defaultDeps = ["require", "exports", "module"];
 
   function Module(name, deps, callback, exports) {
-    this.id       = uuid++;
-    this.name     = name;
-    this.deps     = !deps.length && callback.length ? defaultDeps : deps;
-    this.exports  = exports || { };
+    this.id = uuid++;
+    this.name = name;
+    this.deps = !deps.length && callback.length ? defaultDeps : deps;
+    this.exports = exports || {};
     this.callback = callback;
-    this.state    = undefined;
-    this._require  = undefined;
+    this.state = undefined;
+    this._require = undefined;
   }
 
-
   Module.prototype.makeRequire = function() {
     var name = this.name;
 
-    return this._require || (this._require = function(dep) {
-      return requirejs(resolve(dep, name));
-    });
+    return (
+      this._require ||
+      (this._require = function(dep) {
+        return requirejs(resolve(dep, name));
+      })
+    );
   };
 
   define = function(name, deps, callback) {
@@ -65,7 +74,7 @@ var define, requirejs;
 
     if (!_isArray(deps)) {
       callback = deps;
-      deps     =  [];
+      deps = [];
     }
 
     registry[name] = new Module(name, deps, callback);
@@ -74,7 +83,7 @@ var define, requirejs;
   // we don't support all of AMD
   // define.amd = {};
   // we will support petals...
-  define.petal = { };
+  define.petal = {};
 
   function Alias(path) {
     this.name = path;
@@ -91,15 +100,15 @@ var define, requirejs;
     var dep;
     // TODO: new Module
     // TODO: seen refactor
-    var module = { };
+    var module = {};
 
     for (var i = 0, l = length; i < l; i++) {
       dep = deps[i];
-      if (dep === 'exports') {
+      if (dep === "exports") {
         module.exports = reified[i] = rseen;
-      } else if (dep === 'require') {
+      } else if (dep === "require") {
         reified[i] = mod.makeRequire();
-      } else if (dep === 'module') {
+      } else if (dep === "module") {
         mod.exports = rseen;
         module = reified[i] = mod;
       } else {
@@ -114,28 +123,29 @@ var define, requirejs;
   }
 
   function requireFrom(name, origin) {
-
     var mod = registry[name];
     if (!mod) {
       var moved = MOVED_MODULES[name];
       if (moved) {
-        console.warn("DEPRECATION: `" + name + "` was moved to `" + moved + "`"); // eslint-disable-line no-console
+        var msg = "DEPRECATION: `" + name + "` was moved to `" + moved + "`";
+        console.warn(msg); // eslint-disable-line no-console
       }
       mod = registry[moved];
     }
 
     if (!mod) {
-      throw new Error('Could not find module `' + name + '` imported from `' + origin + '`');
+      throw new Error(
+        "Could not find module `" + name + "` imported from `" + origin + "`"
+      );
     }
     return requirejs(name);
   }
 
   function missingModule(name) {
-    throw new Error('Could not find module ' + name);
+    throw new Error("Could not find module " + name);
   }
 
   requirejs = require = function(name) {
-
     if (MOVED_MODULES[name]) {
       name = MOVED_MODULES[name];
     }
@@ -146,10 +156,11 @@ var define, requirejs;
       mod = registry[mod.callback.name];
     }
 
-    if (!mod) { missingModule(name); }
+    if (!mod) {
+      missingModule(name);
+    }
 
-    if (mod.state !== FAILED &&
-        seen.hasOwnProperty(name)) {
+    if (mod.state !== FAILED && seen.hasOwnProperty(name)) {
       return seen[name];
     }
 
@@ -157,17 +168,20 @@ var define, requirejs;
     var module;
     var loaded = false;
 
-    seen[name] = { }; // placeholder for run-time cycles
+    seen[name] = {}; // placeholder for run-time cycles
 
-    tryFinally(function() {
-      reified = reify(mod, name, seen[name]);
-      module = mod.callback.apply(this, reified.deps);
-      loaded = true;
-    }, function() {
-      if (!loaded) {
-        mod.state = FAILED;
+    tryFinally(
+      function() {
+        reified = reify(mod, name, seen[name]);
+        module = mod.callback.apply(this, reified.deps);
+        loaded = true;
+      },
+      function() {
+        if (!loaded) {
+          mod.state = FAILED;
+        }
       }
-    });
+    );
 
     var obj;
     if (module === undefined && reified.module.exports) {
@@ -176,10 +190,12 @@ var define, requirejs;
       obj = seen[name] = module;
     }
 
-    if (obj !== null &&
-        (typeof obj === 'object' || typeof obj === 'function') &&
-          obj['default'] === undefined) {
-      obj['default'] = obj;
+    if (
+      obj !== null &&
+      (typeof obj === "object" || typeof obj === "function") &&
+      obj["default"] === undefined
+    ) {
+      obj["default"] = obj;
     }
 
     return (seen[name] = obj);
@@ -187,26 +203,30 @@ var define, requirejs;
   window.requireModule = requirejs;
 
   function resolve(child, name) {
-    if (child.charAt(0) !== '.') { return child; }
+    if (child.charAt(0) !== ".") {
+      return child;
+    }
 
-    var parts = child.split('/');
-    var nameParts = name.split('/');
+    var parts = child.split("/");
+    var nameParts = name.split("/");
     var parentBase = nameParts.slice(0, -1);
 
     for (var i = 0, l = parts.length; i < l; i++) {
       var part = parts[i];
 
-      if (part === '..') {
+      if (part === "..") {
         if (parentBase.length === 0) {
-          throw new Error('Cannot access parent module of root');
+          throw new Error("Cannot access parent module of root");
         }
         parentBase.pop();
-      } else if (part === '.') {
+      } else if (part === ".") {
         continue;
-      } else { parentBase.push(part); }
+      } else {
+        parentBase.push(part);
+      }
     }
 
-    return parentBase.join('/');
+    return parentBase.join("/");
   }
 
   requirejs.entries = requirejs._eak_seen = registry;

From 3085b923f66d3eaf0e066e9e56d71491a0e0c05e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 21 Oct 2019 11:59:13 -0400
Subject: [PATCH 108/328] Removed `MOVED_MODULES` which is 3 years old

---
 app/assets/javascripts/discourse-loader.js | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 6809670b93..35378f42f7 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,18 +1,6 @@
 var define, requirejs;
 
 (function() {
-  var MOVED_MODULES = {
-    "discourse/views/list/post-count-or-badges":
-      "discourse/raw-views/list/post-count-or-badges",
-    "discourse/views/list/posts-count-column":
-      "discourse/raw-views/list/posts-count-column",
-    "discourse/views/list/visited-line":
-      "discourse/raw-views/list/visited-line",
-    "discourse/views/topic-list-header-column":
-      "discourse/raw-views/topic-list-header-column",
-    "discourse/views/topic-status": "discourse/raw-views/topic-status"
-  };
-
   var _isArray;
   if (!Array.isArray) {
     _isArray = function(x) {
@@ -124,15 +112,6 @@ var define, requirejs;
 
   function requireFrom(name, origin) {
     var mod = registry[name];
-    if (!mod) {
-      var moved = MOVED_MODULES[name];
-      if (moved) {
-        var msg = "DEPRECATION: `" + name + "` was moved to `" + moved + "`";
-        console.warn(msg); // eslint-disable-line no-console
-      }
-      mod = registry[moved];
-    }
-
     if (!mod) {
       throw new Error(
         "Could not find module `" + name + "` imported from `" + origin + "`"
@@ -146,10 +125,6 @@ var define, requirejs;
   }
 
   requirejs = require = function(name) {
-    if (MOVED_MODULES[name]) {
-      name = MOVED_MODULES[name];
-    }
-
     var mod = registry[name];
 
     if (mod && mod.callback instanceof Alias) {

From d5121e5ddb1e1929b57a64fb1ad3598cdcee00c8 Mon Sep 17 00:00:00 2001
From: Nacho Caballero <nachocab@gmail.com>
Date: Mon, 21 Oct 2019 18:10:40 +0200
Subject: [PATCH 109/328] FIX: Add common HTML5 media extensions to onebox
 audio and video tags (#8216)

---
 lib/oneboxer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 863b1a782a..871e48c96e 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -171,9 +171,9 @@ module Oneboxer
 
   def self.local_upload_html(url)
     case File.extname(URI(url).path || "")
-    when /^\.(mov|mp4|webm|ogv)$/i
+    when /^\.(mov|mp4|m4v|webm|ogv|3gp)$/i
       "<video width='100%' height='100%' controls><source src='#{url}'><a href='#{url}'>#{url}</a></video>"
-    when /^\.(mp3|ogg|wav|m4a)$/i
+    when /^\.(mp3|og[ga]|opus|wav|m4[abpr]|aac|flac)$/i
       "<audio controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
     end
   end

From 835d2be4da2aa52f4ae2771b2b72477172c21f5b Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 21 Oct 2019 13:14:15 -0300
Subject: [PATCH 110/328] FIX: Rate limit and hijack certificate generation.
 (#8215)

To eliminate a DDOS attack vector, we're taking the following measures:

The endpoint will be rate-limited to 3 requests every 60 seconds (per user).
A 24 hours max-age cache header is sent with the response.
The route will be hijacked to generate the certificate in the background.
---
 .../certificate_generator.rb                  | 46 ++++++++++---------
 plugins/discourse-narrative-bot/plugin.rb     | 37 +++++++++------
 .../spec/lib/certificate_generator_spec.rb    |  6 ++-
 .../requests/discobot_certificate_spec.rb     |  3 +-
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
index ad805ae8d9..f5660854de 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
@@ -2,8 +2,9 @@
 
 module DiscourseNarrativeBot
   class CertificateGenerator
-    def initialize(user, date)
+    def initialize(user, date, avatar_url)
       @user = user
+      @avatar_url = avatar_url
 
       date =
         begin
@@ -21,29 +22,36 @@ module DiscourseNarrativeBot
     end
 
     def new_user_track
-      width = 538.583 # Default width for the SVG
-      ApplicationController.render(inline: File.read(File.expand_path('../templates/new_user.svg.erb', __FILE__)),
-                                   assigns: { width: width,
-                                              discobot_user: @discobot_user,
-                                              date: @date,
-                                              avatar_url: base64_image_link(avatar_url),
-                                              logo_group: logo_group(55, width, 350),
-                                              name: name })
+      svg_default_width = 538.583
+      logo_container = logo_group(55, svg_default_width, 350)
+
+      ApplicationController.render(inline: read_template('new_user'), assigns: assign_options(svg_default_width, logo_container))
     end
 
     def advanced_user_track
-      width = 722.8 # Default width for the SVG
-      ApplicationController.render(inline: File.read(File.expand_path('../templates/advanced_user.svg.erb', __FILE__)),
-                                   assigns: { width: width,
-                                              discobot_user: @discobot_user,
-                                              date: @date,
-                                              avatar_url: base64_image_link(avatar_url),
-                                              logo_group: logo_group(40, width, 280),
-                                              name: name })
+      svg_default_width = 722.8
+      logo_container = logo_group(40, svg_default_width, 280)
+
+      ApplicationController.render(inline: read_template('advanced_user'), assigns: assign_options(svg_default_width, logo_container))
     end
 
     private
 
+    def read_template(filename)
+      File.read(File.expand_path("../templates/#{filename}.svg.erb", __FILE__))
+    end
+
+    def assign_options(width, logo_group)
+      {
+        width: width,
+        discobot_user: @discobot_user,
+        date: @date,
+        avatar_url: base64_image_link(@avatar_url),
+        logo_group: logo_group,
+        name: name
+      }
+    end
+
     def name
       @user.username.titleize
     end
@@ -84,9 +92,5 @@ module DiscourseNarrativeBot
     rescue OpenURI::HTTPError
       # Ignore if fetching image returns a non 200 response
     end
-
-    def avatar_url
-      UrlHelper.absolute(Discourse.base_uri + @user.avatar_template.gsub('{size}', '250'))
-    end
   end
 end
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 7368b371d8..0c61b923b6 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -80,31 +80,38 @@ after_initialize do
       requires_login
 
       def generate
-        unless params[:user_id]&.present?
-          raise Discourse::InvalidParameters.new('user_id must be present')
+        immutable_for(24.hours)
+
+        %i[date user_id].each do |key|
+          raise Discourse::InvalidParameters.new("#{key} must be present") unless params[key]&.present?
         end
 
+        rate_limiter = RateLimiter.new(current_user, 'svg_certificate', 3, 1.minute)
+        rate_limiter.performed! unless current_user.staff?
+
         user = User.find_by(id: params[:user_id])
         raise Discourse::NotFound if user.blank?
+        cdn_avatar_url = fetch_avatar_url(user)
 
-        unless params[:date]&.present?
-          raise Discourse::InvalidParameters.new('date must be present')
-        end
+        hijack do
+          generator = CertificateGenerator.new(user, params[:date], cdn_avatar_url)
 
-        generator = CertificateGenerator.new(user, params[:date])
+          svg = params[:type] == 'advanced' ? generator.advanced_user_track : generator.new_user_track
 
-        svg =
-          case params[:type]
-          when 'advanced'
-            generator.advanced_user_track
-          else
-            generator.new_user_track
+          respond_to do |format|
+            format.svg { render inline: svg }
           end
-
-        respond_to do |format|
-          format.svg { render inline: svg }
         end
       end
+
+      private
+
+      def fetch_avatar_url(user)
+        avatar_url = UrlHelper.absolute(Discourse.base_uri + user.avatar_template.gsub('{size}', '250'))
+        URI(avatar_url).open('rb', redirect: false).read
+      rescue OpenURI::HTTPError
+        # Ignore if fetching image returns a non 200 response
+      end
     end
   end
 
diff --git a/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb b/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
index c6cd3a50f2..991cd082b3 100644
--- a/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
@@ -4,10 +4,12 @@ require 'rails_helper'
 
 RSpec.describe DiscourseNarrativeBot::CertificateGenerator do
   let(:user) { Fabricate(:user) }
+  let(:avatar_url) { 'http://test.localhost/cdn/avatar.png' }
+  let(:date) { "2017-00-10" }
 
   describe 'when an invalid date is given' do
     it 'should default to the current date' do
-      expect { described_class.new(user, "2017-00-10") }.to_not raise_error
+      expect { described_class.new(user, date, avatar_url) }.to_not raise_error
     end
   end
 
@@ -19,7 +21,7 @@ RSpec.describe DiscourseNarrativeBot::CertificateGenerator do
       end
 
       it 'should not try to fetch a image' do
-        expect(described_class.new(user, "2017-02-10").send(:logo_group, 1, 1, 1))
+        expect(described_class.new(user, date, avatar_url).send(:logo_group, 1, 1, 1))
           .to eq(nil)
       end
     end
diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
index 805838b09c..d30c76cf6a 100644
--- a/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
@@ -27,7 +27,8 @@ describe "Discobot Certificate" do
       end
 
       it 'should return the right text' do
-        stub_request(:get, /letter_avatar_proxy/).to_return(status: 200)
+        stub_request(:get, /letter_avatar_proxy/).to_return(status: 200, body: 'http://test.localhost/cdn/avatar.png')
+        stub_request(:get, /avatar.png/).to_return(status: 200)
 
         stub_request(:get, SiteSetting.site_logo_small_url)
           .to_return(status: 200)

From 56862f61c0e488c1228ab714690b29f435c999cf Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 21 Oct 2019 12:22:19 -0400
Subject: [PATCH 111/328] Add group name classes to tag page so groups can be
 hidden with CSS (#8118)

---
 .../discourse/components/tag-list.js.es6            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js.es6
index a6578bb398..e703a1801d 100644
--- a/app/assets/javascripts/discourse/components/tag-list.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-list.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [":tag-list", "categoryClass"],
+  classNameBindings: [":tag-list", "categoryClass", "tagGroupNameClass"],
 
   isPrivateMessage: false,
   sortedTags: Ember.computed.sort("tags", "sortProperties"),
@@ -19,5 +19,16 @@ export default Ember.Component.extend({
   @computed("category.fullSlug")
   categoryClass(slug) {
     return slug && `tag-list-${slug}`;
+  },
+
+  @computed("tagGroupName")
+  tagGroupNameClass(groupName) {
+    if (groupName) {
+      groupName = groupName
+        .replace(/\s+/g, "-")
+        .replace(/[!\"#$%&'\(\)\*\+,\.\/:;<=>\?\@\[\\\]\^`\{\|\}~]/g, "")
+        .toLowerCase();
+      return groupName && `tag-group-${groupName}`;
+    }
   }
 });

From b41b12ad71eeb11e2ce1ed7e0eb759cc33cc7c59 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 21 Oct 2019 12:22:55 -0400
Subject: [PATCH 112/328] Add unique class to custom field wrappers (#8193)

---
 .../discourse/components/user-field.js.es6          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js.es6
index 1585e9a3a5..9851b45762 100644
--- a/app/assets/javascripts/discourse/components/user-field.js.es6
+++ b/app/assets/javascripts/discourse/components/user-field.js.es6
@@ -2,11 +2,22 @@ import { fmt } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [":user-field", "field.field_type"],
+  classNameBindings: [":user-field", "field.field_type", "customFieldClass"],
   layoutName: fmt("field.field_type", "components/user-fields/%@"),
 
   @computed
   noneLabel() {
     return "user_fields.none";
+  },
+
+  @computed("field.name")
+  customFieldClass(fieldName) {
+    if (fieldName) {
+      fieldName = fieldName
+        .replace(/\s+/g, "-")
+        .replace(/[!\"#$%&'\(\)\*\+,\.\/:;<=>\?\@\[\\\]\^`\{\|\}~]/g, "")
+        .toLowerCase();
+      return fieldName && `user-field-${fieldName}`;
+    }
   }
 });

From 1358312584412d4b30163e24d710d525db3649fc Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 21 Oct 2019 20:25:35 +0300
Subject: [PATCH 113/328] FIX: Zeitwerk-related fixes for jobs. (#8219)

---
 app/jobs/regular/bulk_invite.rb                  | 2 +-
 app/jobs/regular/emit_web_hook_event.rb          | 2 +-
 app/jobs/regular/process_bulk_invite_emails.rb   | 4 ++--
 app/jobs/regular/suspicious_login.rb             | 2 +-
 app/jobs/scheduled/activation_reminder_emails.rb | 2 +-
 app/jobs/scheduled/enqueue_digest_emails.rb      | 2 +-
 app/jobs/scheduled/schedule_backup.rb            | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index b5980a0db9..8a5d248548 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -25,7 +25,7 @@ module Jobs
       process_invites(invites)
 
       if @total_invites > Invite::BULK_INVITE_EMAIL_LIMIT
-        Jobs.enqueue(:process_bulk_invite_emails)
+        ::Jobs.enqueue(:process_bulk_invite_emails)
       end
     ensure
       notify_user
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index fd7f8ae2a7..74c8153ad6 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -93,7 +93,7 @@ module Jobs
         @retry_count += 1
         return if @retry_count > MAX_RETRY_COUNT
         delay = RETRY_BACKOFF**(@retry_count - 1)
-        Jobs.enqueue_in(delay.minutes, :emit_web_hook_event, @arguments)
+        ::Jobs.enqueue_in(delay.minutes, :emit_web_hook_event, @arguments)
       end
     end
 
diff --git a/app/jobs/regular/process_bulk_invite_emails.rb b/app/jobs/regular/process_bulk_invite_emails.rb
index c7901d29c0..f8b8a13846 100644
--- a/app/jobs/regular/process_bulk_invite_emails.rb
+++ b/app/jobs/regular/process_bulk_invite_emails.rb
@@ -10,9 +10,9 @@ module Jobs
       if pending_invite_ids.length > 0
         Invite.where(id: pending_invite_ids).update_all(emailed_status: Invite.emailed_status_types[:sending])
         pending_invite_ids.each do |invite_id|
-          Jobs.enqueue(:invite_email, invite_id: invite_id)
+          ::Jobs.enqueue(:invite_email, invite_id: invite_id)
         end
-        Jobs.enqueue_in(1.minute, :process_bulk_invite_emails)
+        ::Jobs.enqueue_in(1.minute, :process_bulk_invite_emails)
       end
     end
   end
diff --git a/app/jobs/regular/suspicious_login.rb b/app/jobs/regular/suspicious_login.rb
index 4ba98be381..2c08776c5d 100644
--- a/app/jobs/regular/suspicious_login.rb
+++ b/app/jobs/regular/suspicious_login.rb
@@ -12,7 +12,7 @@ module Jobs
                           user_agent: args[:user_agent],
                           client_ip: args[:client_ip])
 
-        Jobs.enqueue(:critical_user_email,
+        ::Jobs.enqueue(:critical_user_email,
                      type: :suspicious_login,
                      user_id: args[:user_id],
                      client_ip: args[:client_ip],
diff --git a/app/jobs/scheduled/activation_reminder_emails.rb b/app/jobs/scheduled/activation_reminder_emails.rb
index df0b1f86ec..171b5d139c 100644
--- a/app/jobs/scheduled/activation_reminder_emails.rb
+++ b/app/jobs/scheduled/activation_reminder_emails.rb
@@ -14,7 +14,7 @@ module Jobs
         user.save_custom_fields
 
         email_token = user.email_tokens.create!(email: user.email)
-        Jobs.enqueue(:user_email,
+        ::Jobs.enqueue(:user_email,
                      type: :activation_reminder,
                      user_id: user.id,
                      email_token: email_token.token)
diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb
index 59b091263c..18db50135a 100644
--- a/app/jobs/scheduled/enqueue_digest_emails.rb
+++ b/app/jobs/scheduled/enqueue_digest_emails.rb
@@ -8,7 +8,7 @@ module Jobs
     def execute(args)
       return if SiteSetting.disable_digest_emails? || SiteSetting.private_email?
       target_user_ids.each do |user_id|
-        Jobs.enqueue(:user_email, type: :digest, user_id: user_id)
+        ::Jobs.enqueue(:user_email, type: :digest, user_id: user_id)
       end
     end
 
diff --git a/app/jobs/scheduled/schedule_backup.rb b/app/jobs/scheduled/schedule_backup.rb
index 8b9d43aff4..b64766a030 100644
--- a/app/jobs/scheduled/schedule_backup.rb
+++ b/app/jobs/scheduled/schedule_backup.rb
@@ -14,12 +14,12 @@ module Jobs
         return if (date + SiteSetting.backup_frequency.days) > Time.now.utc.to_date
       end
 
-      Jobs.cancel_scheduled_job(:create_backup)
+      ::Jobs.cancel_scheduled_job(:create_backup)
 
       time_of_day = Time.parse(SiteSetting.backup_time_of_day)
       seconds = time_of_day.hour.hours + time_of_day.min.minutes + rand(10.minutes)
 
-      Jobs.enqueue_in(seconds, :create_backup)
+      ::Jobs.enqueue_in(seconds, :create_backup)
     rescue => e
       notify_user(e)
       raise

From 3ad07aacfaab57aa458b43c3896ccb805bb26722 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 21 Oct 2019 20:25:46 +0300
Subject: [PATCH 114/328] FIX: Reload only notifications when refreshing
 notification count (#8221)

Previously, we used to reload the whole User instance which discarded
any changes made (for example setting 'unstage' to false).
---
 app/models/notification.rb |  3 ++-
 spec/models/user_spec.rb   | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 6a4413e7f5..4f300f8138 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -218,7 +218,8 @@ class Notification < ActiveRecord::Base
 
   def refresh_notification_count
     begin
-      user.reload.publish_notifications_state
+      user.notifications.reset
+      user.publish_notifications_state
     rescue ActiveRecord::RecordNotFound
       # happens when we delete a user
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 29dcad458b..8055ad48a0 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1821,7 +1821,7 @@ describe User 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' } }
 
-    it "correctyl unstages a user" do
+    it "correctly unstages a user" do
       user = User.unstage(params)
 
       expect(user.id).to eq(staged_user.id)
@@ -1829,6 +1829,7 @@ describe User do
       expect(user.name).to eq('Foo Bar')
       expect(user.active).to eq(false)
       expect(user.email).to eq('staged@account.com')
+      expect(user.staged).to eq(false)
     end
 
     it "returns nil when the user cannot be unstaged" do
@@ -1838,13 +1839,14 @@ describe User do
     end
 
     it "removes all previous notifications during unstaging" do
-      Fabricate(:notification, user: user)
-      Fabricate(:private_message_notification, user: user)
-      user.reload
+      Fabricate(:notification, user: staged_user)
+      Fabricate(:private_message_notification, user: staged_user)
+      staged_user.reload
 
-      expect(user.total_unread_notifications).to eq(2)
+      expect(staged_user.total_unread_notifications).to eq(2)
       user = User.unstage(params)
       expect(user.total_unread_notifications).to eq(0)
+      expect(user.staged).to eq(false)
     end
 
     it "triggers an event" do

From 2e73985d1b9d28509e7f31f0a45ce11172c2db6d Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 21 Oct 2019 14:33:19 -0300
Subject: [PATCH 115/328] FIX: Make category updates slug validation idempotent

Co-authored-by: Michael Brown <supermathie@gmail.com>
---
 app/models/category.rb       | 1 +
 spec/models/category_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/app/models/category.rb b/app/models/category.rb
index 40f5791090..a6c5deb488 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -285,6 +285,7 @@ class Category < ActiveRecord::Base
 
     if slug.present?
       # santized custom slug
+      slug = SiteSetting.slug_generation_method == 'encoded' ? CGI.unescape(self.slug) : self.slug
       self.slug = Slug.sanitize(slug)
       errors.add(:slug, 'is already in use') if duplicate_slug?
     else
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 225b87eeab..fdf2b7a9e5 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -316,6 +316,12 @@ describe Category do
         expect(@category.slug).to eq("%E6%B5%8B%E8%AF%95")
         expect(@category.slug_for_url).to eq("%E6%B5%8B%E8%AF%95")
       end
+
+      it "keeps the slug" do
+        @category.save
+        expect(@category.slug).to eq("%E6%B5%8B%E8%AF%95")
+        expect(@category.slug_for_url).to eq("%E6%B5%8B%E8%AF%95")
+      end
     end
   end
 

From 40b0b549ffdfa4b5f02f6df012869a3834d31a30 Mon Sep 17 00:00:00 2001
From: Michael Brown <supermathie@gmail.com>
Date: Mon, 21 Oct 2019 13:35:19 -0400
Subject: [PATCH 116/328] DEV: update the comments re the encoded slug changes

* followup to 2e73985d
---
 app/models/category.rb       | 3 ++-
 spec/models/category_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index a6c5deb488..74a6d87fb5 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -284,8 +284,9 @@ class Category < ActiveRecord::Base
     self.name.strip!
 
     if slug.present?
-      # santized custom slug
+      # if we don't unescape it first we strip the % from the encoded version
       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?
     else
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index fdf2b7a9e5..f9a63c5151 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -317,7 +317,7 @@ describe Category do
         expect(@category.slug_for_url).to eq("%E6%B5%8B%E8%AF%95")
       end
 
-      it "keeps the slug" do
+      it "keeps the encoded slug after saving" do
         @category.save
         expect(@category.slug).to eq("%E6%B5%8B%E8%AF%95")
         expect(@category.slug_for_url).to eq("%E6%B5%8B%E8%AF%95")

From ab53b485b4ea78abec0d81c7de08aa5a3726a8f4 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 21 Oct 2019 13:44:14 -0400
Subject: [PATCH 117/328] Add setter for `excerpt_size` so plugins can set it
 more easily

---
 app/models/post.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 2462b5abb6..06c71b524c 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -157,8 +157,12 @@ class Post < ActiveRecord::Base
     includes(:post_details).find_by(post_details: { key: key, value: value })
   end
 
+  def self.excerpt_size=(sz)
+    @excerpt_size = sz
+  end
+
   def self.excerpt_size
-    220
+    @excerpt_size || 220
   end
 
   def whisper?

From 2f54dd5e3d22e88ef18c3767ffbc1ef5eb0e04f8 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 21 Oct 2019 21:05:25 +0300
Subject: [PATCH 118/328] FIX: Load user model when some attributes are
 missing.

Follow-up to 3ad07aacfaab57aa458b43c3896ccb805bb26722.
---
 app/models/notification.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 4f300f8138..0d2a232b61 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -218,8 +218,12 @@ class Notification < ActiveRecord::Base
 
   def refresh_notification_count
     begin
-      user.notifications.reset
-      user.publish_notifications_state
+      if user.has_attribute?(:seen_notification_id)
+        user.notifications.reset
+        user.publish_notifications_state
+      else
+        User.find_by(id: user.id).publish_notifications_state
+      end
     rescue ActiveRecord::RecordNotFound
       # happens when we delete a user
     end

From ceb74bef8ffc79707ca8206a9305a7b4517af6e3 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 21 Oct 2019 21:33:58 +0300
Subject: [PATCH 119/328] DEV: Add test.

Follow-up to 2f54dd5e3d22e88ef18c3767ffbc1ef5eb0e04f8.
---
 spec/models/notification_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 99a4b48a50..eeb26d3f00 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -128,6 +128,12 @@ describe Notification do
       Fabricate(:notification)
     end
 
+    it 'works for partial model instances' do
+      NotificationEmailer.disable
+      partial_user = User.select(:id).find_by(id: Fabricate(:user).id)
+      partial_user.notifications.create!(notification_type: Notification.types[:mentioned], data: '{}')
+    end
+
     context 'destroy' do
       let!(:notification) { Fabricate(:notification) }
 

From ef0fe51e05f33fbb09ddd1e39f43e966c58d3fbb Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 21 Oct 2019 16:24:41 -0600
Subject: [PATCH 120/328] FIX: Include user id in notification webhook (#8195)

The payload when receiving a notification webhook is pointless without
knowing which user the notification is for. This fix adds the user_id to
the notification serializer so that when you receive a notification
webhook you can properly identify which user the notification is for.

See

https://meta.discourse.org/t/getting-the-target-user-for-notification-webhook-events/129052?u=blake

for more details.
---
 app/serializers/notification_serializer.rb      |  1 +
 .../serializers/notification_serializer_spec.rb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 spec/serializers/notification_serializer_spec.rb

diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index 34780b86a6..e01e639b45 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -3,6 +3,7 @@
 class NotificationSerializer < ApplicationSerializer
 
   attributes :id,
+             :user_id,
              :notification_type,
              :read,
              :created_at,
diff --git a/spec/serializers/notification_serializer_spec.rb b/spec/serializers/notification_serializer_spec.rb
new file mode 100644
index 0000000000..63f305e00c
--- /dev/null
+++ b/spec/serializers/notification_serializer_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe NotificationSerializer do
+  describe '#as_json' do
+    fab!(:user) { Fabricate(:user) }
+    let(:notification) { Fabricate(:notification, user: user) }
+    let(:serializer) { NotificationSerializer.new(notification) }
+    let(:json) { serializer.as_json }
+
+    it "returns the user_id" do
+      expect(json[:notification][:user_id]).to eq(user.id)
+    end
+
+  end
+end

From 3201613f138bf574577d77631f8214098e22b7e3 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 21 Oct 2019 22:02:49 -0600
Subject: [PATCH 121/328] FEATURE: Include image url in topic serializer

The `image_url` is already included when fetching a list of topics, and
this commit adds it to the individual topic serializer so that it is
available via the api.

See

https://meta.discourse.org/t/single-topic-api-endpoint-should-contain-image-url/131020

for more details.
---
 app/serializers/topic_view_serializer.rb      |  3 ++-
 .../serializers/topic_view_serializer_spec.rb | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 233303f8f0..780a004d6d 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -39,7 +39,8 @@ class TopicViewSerializer < ApplicationSerializer
     :featured_link_root_domain,
     :pinned_globally,
     :pinned_at,
-    :pinned_until
+    :pinned_until,
+    :image_url
   )
 
   attributes(
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 13ec3064a7..ccf8a64758 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -45,6 +45,30 @@ describe TopicViewSerializer do
     end
   end
 
+  describe '#image_url' do
+    let(:image_url) { 'http://meta.discourse.org/images/welcome/discourse-edit-post-animated.gif' }
+
+    describe 'when a topic has an image' do
+      it 'should return the image url' do
+        topic.update!(image_url: image_url)
+
+        json = serialize_topic(topic, user)
+
+        expect(json[:image_url]).to eq(image_url)
+      end
+    end
+
+    describe 'when a topic does not contain an image' do
+      it 'should return a nil image url' do
+
+        json = serialize_topic(topic, user)
+
+        expect(json.has_key? :image_url).to eq(true)
+        expect(json[:image_url]).to eq(nil)
+      end
+    end
+  end
+
   describe '#suggested_topics' do
     let(:topic2) { Fabricate(:topic) }
 

From 12409f63a02c81590c2113255ffaa04ac4784f29 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 22 Oct 2019 12:26:01 +0530
Subject: [PATCH 122/328] Bump onebox version.

- FIX: Follow redirect returns url if response code is 200
- FIX: do not resize xkcd image
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8f032801eb..9f52abc977 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.9.19'
+gem 'onebox', '1.9.20'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b43335ea81..960a04c35c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,7 @@ GEM
     mocha (1.8.0)
       metaclass (~> 0.0.1)
     mock_redis (0.19.0)
-    moneta (1.1.1)
+    moneta (1.2.0)
     msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -244,7 +244,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.19)
+    onebox (1.9.20)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -499,7 +499,7 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.9.19)
+  onebox (= 1.9.20)
   openid-redis-store
   parallel_tests
   pg

From e5311ab645f42e226cf30efd1c738c1fa4ce506f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Tue, 22 Oct 2019 08:46:10 -0500
Subject: [PATCH 123/328] DEV: Import DiscourseRoute rather than
 Discourse.Route (#8225)

* DEV: Discourse.Route -> DiscourseRoute with import

* ran prettier on all routes

* prettiered one more file
---
 app/assets/javascripts/admin/routes/admin-backups.js.es6      | 3 ++-
 app/assets/javascripts/admin/routes/admin-badges.js.es6       | 3 ++-
 .../javascripts/admin/routes/admin-dashboard-general.js.es6   | 4 +++-
 .../javascripts/admin/routes/admin-dashboard-reports.js.es6   | 3 ++-
 app/assets/javascripts/admin/routes/admin-dashboard.js.es6    | 3 ++-
 .../javascripts/admin/routes/admin-email-incomings.js.es6     | 3 ++-
 app/assets/javascripts/admin/routes/admin-email-index.js.es6  | 3 ++-
 app/assets/javascripts/admin/routes/admin-email-logs.js.es6   | 4 +++-
 .../admin/routes/admin-email-preview-digest.js.es6            | 3 ++-
 app/assets/javascripts/admin/routes/admin-emojis.js.es6       | 4 +++-
 .../javascripts/admin/routes/admin-flags-posts-active.js.es6  | 4 +++-
 .../javascripts/admin/routes/admin-flags-posts-old.js.es6     | 4 +++-
 .../javascripts/admin/routes/admin-flags-topics-index.js.es6  | 4 +++-
 app/assets/javascripts/admin/routes/admin-logs-index.js.es6   | 4 +++-
 .../admin/routes/admin-logs-screened-emails.js.es6            | 4 +++-
 .../admin/routes/admin-logs-screened-ip-addresses.js.es6      | 4 +++-
 .../javascripts/admin/routes/admin-logs-screened-urls.js.es6  | 4 +++-
 .../admin/routes/admin-logs-staff-action-logs.js.es6          | 3 ++-
 app/assets/javascripts/admin/routes/admin-permalinks.js.es6   | 3 ++-
 .../javascripts/admin/routes/admin-reports-index.js.es6       | 4 +++-
 app/assets/javascripts/admin/routes/admin-reports-show.js.es6 | 4 +++-
 .../javascripts/admin/routes/admin-search-logs-index.js.es6   | 3 ++-
 .../javascripts/admin/routes/admin-search-logs-term.js.es6    | 3 ++-
 .../admin/routes/admin-site-settings-category.js.es6          | 4 +++-
 .../javascripts/admin/routes/admin-site-settings-index.js.es6 | 4 +++-
 .../javascripts/admin/routes/admin-site-settings.js.es6       | 3 ++-
 app/assets/javascripts/admin/routes/admin-user-badges.js.es6  | 3 ++-
 app/assets/javascripts/admin/routes/admin-user-fields.js.es6  | 3 ++-
 app/assets/javascripts/admin/routes/admin-user-index.js.es6   | 3 ++-
 .../admin/routes/admin-user-tl3-requirements.js.es6           | 4 +++-
 app/assets/javascripts/admin/routes/admin-user.js.es6         | 3 ++-
 app/assets/javascripts/admin/routes/admin-users-index.js.es6  | 4 +++-
 .../javascripts/admin/routes/admin-users-list-index.js.es6    | 4 +++-
 .../javascripts/admin/routes/admin-users-list-show.js.es6     | 4 +++-
 app/assets/javascripts/admin/routes/admin-users-list.js.es6   | 3 ++-
 .../admin/routes/admin-watched-words-action.js.es6            | 4 +++-
 .../javascripts/admin/routes/admin-watched-words-index.js.es6 | 4 +++-
 .../javascripts/admin/routes/admin-watched-words.js.es6       | 3 ++-
 .../admin/routes/admin-web-hooks-show-events.js.es6           | 4 +++-
 .../javascripts/admin/routes/admin-web-hooks-show.js.es6      | 4 +++-
 app/assets/javascripts/admin/routes/admin.js.es6              | 4 +++-
 .../javascripts/discourse/lib/static-route-builder.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/about.js.es6          | 4 +++-
 app/assets/javascripts/discourse/routes/application.js.es6    | 3 ++-
 .../javascripts/discourse/routes/associate-account.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/badges-index.js.es6   | 3 ++-
 app/assets/javascripts/discourse/routes/badges-show.js.es6    | 3 ++-
 .../discourse/routes/build-admin-user-posts-route.js.es6      | 3 ++-
 .../javascripts/discourse/routes/build-category-route.js.es6  | 3 ++-
 .../javascripts/discourse/routes/build-topic-route.js.es6     | 3 ++-
 .../javascripts/discourse/routes/discovery-categories.js.es6  | 3 ++-
 app/assets/javascripts/discourse/routes/discovery.js.es6      | 3 ++-
 app/assets/javascripts/discourse/routes/email-login.js.es6    | 3 ++-
 app/assets/javascripts/discourse/routes/exception.js.es6      | 4 +++-
 .../javascripts/discourse/routes/full-page-search.js.es6      | 3 ++-
 .../javascripts/discourse/routes/group-activity-posts.js.es6  | 4 +++-
 .../javascripts/discourse/routes/group-activity-topics.js.es6 | 4 +++-
 app/assets/javascripts/discourse/routes/group-index.js.es6    | 3 ++-
 .../javascripts/discourse/routes/group-manage-index.js.es6    | 4 +++-
 .../discourse/routes/group-manage-interaction.js.es6          | 4 +++-
 .../javascripts/discourse/routes/group-manage-logs.js.es6     | 4 +++-
 .../discourse/routes/group-manage-membership.js.es6           | 4 +++-
 .../javascripts/discourse/routes/group-manage-profile.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/group-manage.js.es6   | 4 +++-
 app/assets/javascripts/discourse/routes/group-members.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/group-messages.js.es6 | 4 +++-
 app/assets/javascripts/discourse/routes/group-requests.js.es6 | 4 +++-
 app/assets/javascripts/discourse/routes/group.js.es6          | 4 +++-
 app/assets/javascripts/discourse/routes/groups-index.js.es6   | 4 +++-
 app/assets/javascripts/discourse/routes/groups-new.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/invites-show.js.es6   | 3 ++-
 app/assets/javascripts/discourse/routes/new-message.js.es6    | 3 ++-
 app/assets/javascripts/discourse/routes/new-topic.js.es6      | 3 ++-
 app/assets/javascripts/discourse/routes/password-reset.js.es6 | 3 ++-
 app/assets/javascripts/discourse/routes/post.js.es6           | 3 ++-
 app/assets/javascripts/discourse/routes/review-index.js.es6   | 4 +++-
 .../javascripts/discourse/routes/review-settings.js.es6       | 4 +++-
 app/assets/javascripts/discourse/routes/review-show.js.es6    | 4 +++-
 app/assets/javascripts/discourse/routes/review-topics.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/review.js.es6         | 4 +++-
 .../javascripts/discourse/routes/tag-groups-show.js.es6       | 4 +++-
 app/assets/javascripts/discourse/routes/tag-groups.js.es6     | 4 +++-
 app/assets/javascripts/discourse/routes/tags-index.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/tags-show.js.es6      | 3 ++-
 .../javascripts/discourse/routes/topic-by-slug-or-id.js.es6   | 3 ++-
 .../javascripts/discourse/routes/topic-from-params.js.es6     | 3 ++-
 app/assets/javascripts/discourse/routes/topic.js.es6          | 3 ++-
 app/assets/javascripts/discourse/routes/unknown.js.es6        | 3 ++-
 .../javascripts/discourse/routes/user-activity-drafts.js.es6  | 4 +++-
 .../javascripts/discourse/routes/user-activity-stream.js.es6  | 3 ++-
 app/assets/javascripts/discourse/routes/user-activity.js.es6  | 4 +++-
 app/assets/javascripts/discourse/routes/user-badges.js.es6    | 3 ++-
 app/assets/javascripts/discourse/routes/user-index.js.es6     | 4 +++-
 .../javascripts/discourse/routes/user-invited-index.js.es6    | 4 +++-
 .../javascripts/discourse/routes/user-invited-show.js.es6     | 3 ++-
 .../discourse/routes/user-notifications-index.js.es6          | 4 +++-
 .../javascripts/discourse/routes/user-notifications.js.es6    | 3 ++-
 .../discourse/routes/user-private-messages-tags.js.es6        | 3 ++-
 .../javascripts/discourse/routes/user-private-messages.js.es6 | 3 ++-
 app/assets/javascripts/discourse/routes/user-summary.js.es6   | 4 +++-
 .../javascripts/discourse/routes/user-topic-list.js.es6       | 3 ++-
 app/assets/javascripts/discourse/routes/user.js.es6           | 4 +++-
 app/assets/javascripts/discourse/routes/users.js.es6          | 4 +++-
 .../javascripts/discourse/routes/route-index.js.es6.erb       | 4 +++-
 .../assets/javascripts/discourse/routes/route-show.js.es6.erb | 4 +++-
 .../assets/javascripts/discourse/routes/route.js.es6.erb      | 4 +++-
 106 files changed, 268 insertions(+), 106 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index b70c978286..44585e5d46 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import BackupStatus from "admin/models/backup-status";
@@ -6,7 +7,7 @@ import PreloadStore from "preload-store";
 
 const LOG_CHANNEL = "/admin/backups/logs";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   activate() {
     this.messageBus.subscribe(LOG_CHANNEL, log => {
       if (log.message === "[STARTED]") {
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js.es6
index 9fee47fb4e..0dac4bbaa2 100644
--- a/app/assets/javascripts/admin/routes/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
 import BadgeGrouping from "discourse/models/badge-grouping";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   _json: null,
 
   model() {
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
index ffd544b3db..1ee1b22121 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   activate() {
     this.controllerFor("admin-dashboard-general").fetchDashboard();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
index 7aea901096..0de5bfe505 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return ajax("/admin/reports").then(json => json);
   },
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
index a6ff3c215e..905a148bc7 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   activate() {
     this.controllerFor("admin-dashboard").fetchProblems();
     this.controllerFor("admin-dashboard").fetchDashboard();
diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
index 79331282bb..aa86f7f31d 100644
--- a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import IncomingEmail from "admin/models/incoming-email";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return IncomingEmail.findAll({ status: this.status });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
index ca912cc009..878885f983 100644
--- a/app/assets/javascripts/admin/routes/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import EmailSettings from "admin/models/email-settings";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return EmailSettings.find();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
index 7813fb93fd..8ebfebd199 100644
--- a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   setupController(controller) {
     controller.setProperties({
       loading: true,
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.es6
index 972f3c9b6d..391ec6c75b 100644
--- a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
@@ -1,9 +1,10 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import {
   default as EmailPreview,
   oneWeekAgo
 } from "admin/models/email-preview";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return EmailPreview.findDigest(this.currentUser.get("username"));
   },
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
index f412a90898..4a001195fc 100644
--- a/app/assets/javascripts/admin/routes/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
@@ -1,5 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
-export default Discourse.Route.extend({
+
+export default DiscourseRoute.extend({
   model: function() {
     return ajax("/admin/customize/emojis.json").then(function(emojis) {
       return emojis.map(function(emoji) {
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.es6
index d971939503..1a1d01a091 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("flagged-post", { filter: "active" });
   }
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.es6
index c7d22ccdad..a4157d5714 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("flagged-post", { filter: "old" });
   }
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.es6
index d635328c05..5fb295d648 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("flagged-topic");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
index ff4c94aada..d003b429b6 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   redirect: function() {
     this.transitionTo("adminLogs.staffActionLogs");
   }
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.es6
index f4f3a4f673..2016a96188 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   renderTemplate: function() {
     this.render("admin/templates/logs/screened-emails", { into: "adminLogs" });
   },
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.es6
index 24000436b7..4343785594 100644
--- 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.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   renderTemplate() {
     this.render("admin/templates/logs/screened-ip-addresses", {
       into: "adminLogs"
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.es6
index 2369a886cd..ba0b76c9c5 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   renderTemplate: function() {
     this.render("admin/templates/logs/screened-urls", { into: "adminLogs" });
   },
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.es6
index fd1fea9615..0ef8e6e232 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   // TODO: make this automatic using an `{{outlet}}`
   renderTemplate: function() {
     this.render("admin/templates/logs/staff-action-logs", {
diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
index d8c3c43865..996b90aaa8 100644
--- a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Permalink from "admin/models/permalink";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return Permalink.findAll();
   },
diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
index 2d21467ae6..864f1a3fb2 100644
--- a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     this.transitionTo("admin.dashboardReports");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
index 9bf9ff8eba..1fa8bc739d 100644
--- a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   queryParams: {
     start_date: { refreshModel: true },
     end_date: { refreshModel: true },
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.es6
index 966032045e..b01674d2f2 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     period: { refreshModel: true },
     searchType: { refreshModel: true }
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.es6
index 40d3e25be6..a0cd40d8b0 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { fillMissingDates } from "discourse/lib/utilities";
 import { translateResults } from "discourse/lib/search";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     term: { refreshModel: true },
     period: { refreshModel: true },
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.es6
index a774415083..2b680c9b83 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     // The model depends on user input, so let the controller do the work:
     this.controllerFor("adminSiteSettingsCategory").set(
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.es6
index 59e851e509..88a091c4b9 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
@@ -2,7 +2,9 @@
   Handles when you click the Site Settings tab in admin, but haven't
   chosen a category. It will redirect to the first category.
 **/
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     this.replaceWith(
       "adminSiteSettingsCategory",
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
index b6c3e857ea..ab687a4585 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import SiteSetting from "admin/models/site-setting";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     filter: { replace: true }
   },
diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
index b585117f19..cce32753d1 100644
--- a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import Badge from "discourse/models/badge";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     const username = this.modelFor("adminUser").get("username");
     return UserBadge.findByUsername(username);
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
index c4278dc627..ea4e0adef0 100644
--- a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import UserField from "admin/models/user-field";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model: function() {
     return this.store.findAll("user-field");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 2b623dbcf8..51af9f2d2e 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return this.modelFor("adminUser");
   },
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.es6
index 6364e89f7c..17cd54dc8a 100644
--- a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.modelFor("adminUser");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js.es6
index c25f750c25..cdb611964e 100644
--- a/app/assets/javascripts/admin/routes/admin-user.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import AdminUser from "admin/models/admin-user";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   serialize(model) {
     return {
       user_id: model.get("id"),
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
index 8b28ea79fc..7549cb230c 100644
--- a/app/assets/javascripts/admin/routes/admin-users-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   redirect: function() {
     this.transitionTo("adminUsersList");
   }
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.es6
index 696345ad42..9f15d72cff 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel: function() {
     this.transitionTo("adminUsersList.show", "active");
   }
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.es6
index e0c1105566..764fe4ad34 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   queryParams: {
     order: { refreshModel: true },
     ascending: { refreshModel: true }
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
index d6b76356f1..9e520d1735 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import AdminUser from "admin/models/admin-user";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   actions: {
     exportUsers() {
       exportEntity("user_list", {
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.es6
index 99450e09ce..d8c76aac5c 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     this.controllerFor("adminWatchedWordsAction").set(
       "actionNameKey",
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.es6
index 4ff2351e1b..a957c11478 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     this.replaceWith(
       "adminWatchedWords.action",
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
index 8970e6a614..924ab49779 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import WatchedWord from "admin/models/watched-word";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     filter: { replace: true }
   },
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.es6
index 1e0d3220cf..f4b6c740d2 100644
--- 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.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     return this.store.findAll(
       "web-hook-event",
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.es6
index 611b015dcb..b68675740d 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   serialize(model) {
     return { web_hook_id: model.get("id") || "new" };
   },
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js.es6
index fa373dd937..bc4e8173ef 100644
--- a/app/assets/javascripts/admin/routes/admin.js.es6
+++ b/app/assets/javascripts/admin/routes/admin.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("admin_title");
   },
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
index efc97411c0..8baa97fb4d 100644
--- a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
+++ b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import StaticPage from "discourse/models/static-page";
 import { default as DiscourseURL, jumpToElement } from "discourse/lib/url";
 
@@ -8,7 +9,7 @@ const configs = {
 };
 
 export default function(page) {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     renderTemplate() {
       this.render("static");
     },
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js.es6
index 3b19492a6b..f7d88a8421 100644
--- a/app/assets/javascripts/discourse/routes/about.js.es6
+++ b/app/assets/javascripts/discourse/routes/about.js.es6
@@ -1,5 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return ajax("/about.json").then(result => {
       let activeAdmins = [];
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index b80b8fe08f..4130d7ffe6 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
 import logout from "discourse/lib/logout";
@@ -20,7 +21,7 @@ function unlessReadOnly(method, message) {
   };
 }
 
-const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
+const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   siteTitle: setting("title"),
   shortSiteDescription: setting("short_site_description"),
 
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js.es6
index d89654e078..7cbfee6754 100644
--- a/app/assets/javascripts/discourse/routes/associate-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/associate-account.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel() {
     const params = this.paramsFor("associate-account");
     this.replaceWith(`preferences.account`, this.currentUser).then(() =>
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js.es6
index 2df72ea584..c4acb15592 100644
--- a/app/assets/javascripts/discourse/routes/badges-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-index.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Badge from "discourse/models/badge";
 import PreloadStore from "preload-store";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     if (PreloadStore.get("badges")) {
       return PreloadStore.getAndRemove("badges").then(json =>
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index 3507beac99..9197a77cc1 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import Badge from "discourse/models/badge";
 import PreloadStore from "preload-store";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     username: {
       refreshModel: true
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.es6
index bc80113310..5bbd0108c6 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { emojiUnescape } from "discourse/lib/text";
 
 export default function(filter) {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     actions: {
       didTransition() {
         this.controllerFor("user").set("indexStream", true);
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index aadf72eb35..99c41ed640 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import {
   filterQueryParams,
   findTopicList
@@ -10,7 +11,7 @@ import Category from "discourse/models/category";
 
 // A helper function to create a category route with parameters
 export default (filterArg, params) => {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     queryParams,
 
     model(modelParams) {
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 72db37455b..e892876dfe 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import { defaultHomepage } from "discourse/lib/utilities";
 
@@ -70,7 +71,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
 
 export default function(filter, extras) {
   extras = extras || {};
-  return Discourse.Route.extend(
+  return DiscourseRoute.extend(
     {
       queryParams,
 
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 49605dd6c3..a6eb60b293 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
 import CategoryList from "discourse/models/category-list";
@@ -7,7 +8,7 @@ import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "preload-store";
 import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
 
-const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
+const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
   renderTemplate() {
     this.render("navigation/categories", { outlet: "navigation-bar" });
     this.render("discovery/categories", { outlet: "list-container" });
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index 234ef15930..68796918ef 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -2,10 +2,11 @@
   The parent route for all discovery routes.
   Handles the logic for showing the loading spinners.
 **/
+import DiscourseRoute from "discourse/routes/discourse";
 import OpenComposer from "discourse/mixins/open-composer";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Discourse.Route.extend(OpenComposer, {
+export default DiscourseRoute.extend(OpenComposer, {
   redirect() {
     return this.redirectIfLoginRequired();
   },
diff --git a/app/assets/javascripts/discourse/routes/email-login.js.es6 b/app/assets/javascripts/discourse/routes/email-login.js.es6
index 617de051cd..642d5ee3d6 100644
--- a/app/assets/javascripts/discourse/routes/email-login.js.es6
+++ b/app/assets/javascripts/discourse/routes/email-login.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("login.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js.es6
index 1b64efb9a6..d90cd0fb76 100644
--- a/app/assets/javascripts/discourse/routes/exception.js.es6
+++ b/app/assets/javascripts/discourse/routes/exception.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   serialize() {
     return "";
   },
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 97ec4772e7..ca7906e109 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import {
   translateResults,
@@ -8,7 +9,7 @@ import PreloadStore from "preload-store";
 import { getTransient, setTransient } from "discourse/lib/page-tracker";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   queryParams: {
     q: {},
     expanded: false,
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 62aad28945..77a8c600cd 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -1,5 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
+
 export function buildGroupPage(type) {
-  return Discourse.Route.extend({
+  return DiscourseRoute.extend({
     type,
 
     titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
index a36ec0e6e5..b1b77f40b7 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t(`groups.topics`);
   },
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 2aab4410ab..a8f630df0f 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.members.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
index 590722bb0f..4e9cf5c71c 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   beforeModel() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
index e8f3be3da2..e273e2d22f 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
index 56b092ecfe..ad49c84619 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.manage.logs.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
index 37746f3e91..1ded3e2b07 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
index e0f133e0ce..b720151ff4 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js.es6
index 54122bcbd4..70b5f053c7 100644
--- a/app/assets/javascripts/discourse/routes/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js.es6
index 8ec71ae22a..872052de67 100644
--- a/app/assets/javascripts/discourse/routes/group-members.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-members.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel: function() {
     this.transitionTo("group.index");
   }
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6
index 82f26f93e2..1a605ec168 100644
--- a/app/assets/javascripts/discourse/routes/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.messages");
   },
diff --git a/app/assets/javascripts/discourse/routes/group-requests.js.es6 b/app/assets/javascripts/discourse/routes/group-requests.js.es6
index c469c9895a..b299bb01bf 100644
--- a/app/assets/javascripts/discourse/routes/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-requests.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.requests.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js.es6
index 9e2c7f87de..bd58f6d3a7 100644
--- a/app/assets/javascripts/discourse/routes/group.js.es6
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return [this.modelFor("group").get("name")];
   },
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js.es6
index e7189d778f..a510bd93b6 100644
--- a/app/assets/javascripts/discourse/routes/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/groups-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("groups.index.title");
   },
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js.es6
index 8c2bbd29a7..67f76347d9 100644
--- a/app/assets/javascripts/discourse/routes/groups-new.js.es6
+++ b/app/assets/javascripts/discourse/routes/groups-new.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   showFooter: true,
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js.es6
index 93f4bdcc40..7ec701b842 100644
--- a/app/assets/javascripts/discourse/routes/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/invites-show.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "preload-store";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("invites.accept_title");
   },
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 42b664fde5..1410c65356 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel(transition) {
     const params = transition.to.queryParams;
 
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js.es6
index 266276fd06..82b2b496ef 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel(transition) {
     if (this.currentUser) {
       let category, categoryId;
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js.es6
index a0ccc31484..393b19f96a 100644
--- a/app/assets/javascripts/discourse/routes/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/routes/password-reset.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "preload-store";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("login.reset_password");
   },
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js.es6
index c63a71243c..15b8aa3d1a 100644
--- a/app/assets/javascripts/discourse/routes/post.js.es6
+++ b/app/assets/javascripts/discourse/routes/post.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   beforeModel({ params }) {
     return ajax(`/p/${params.post.id}`).then(t => {
       this.transitionTo(
diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js.es6
index b6ba62ab45..d5b2fad370 100644
--- a/app/assets/javascripts/discourse/routes/review-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model(params) {
     return this.store.findAll("reviewable", params);
   },
diff --git a/app/assets/javascripts/discourse/routes/review-settings.js.es6 b/app/assets/javascripts/discourse/routes/review-settings.js.es6
index 46ed6f10fa..bb5e2e5fb1 100644
--- a/app/assets/javascripts/discourse/routes/review-settings.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-settings.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.find("reviewable-settings");
   },
diff --git a/app/assets/javascripts/discourse/routes/review-show.js.es6 b/app/assets/javascripts/discourse/routes/review-show.js.es6
index afe7b30a5d..2d6d9795d4 100644
--- a/app/assets/javascripts/discourse/routes/review-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   setupController(controller, model) {
     controller.set("reviewable", model);
   }
diff --git a/app/assets/javascripts/discourse/routes/review-topics.js.es6 b/app/assets/javascripts/discourse/routes/review-topics.js.es6
index 7c3f058fbd..262194ed00 100644
--- a/app/assets/javascripts/discourse/routes/review-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/review-topics.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("reviewable-topic");
   },
diff --git a/app/assets/javascripts/discourse/routes/review.js.es6 b/app/assets/javascripts/discourse/routes/review.js.es6
index 6343919dfc..9c28f22c54 100644
--- a/app/assets/javascripts/discourse/routes/review.js.es6
+++ b/app/assets/javascripts/discourse/routes/review.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     return I18n.t("review.title");
   }
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
index 165ae49d4a..7593f364be 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   model(params) {
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
index ccc7d79b75..1010b04c03 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   model() {
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6
index c9436e876d..99cd3a211d 100644
--- a/app/assets/javascripts/discourse/routes/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Tag from "discourse/models/tag";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return this.store.findAll("tag").then(result => {
       if (result.extras) {
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index 3a10287935..7bf26e26a9 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Composer from "discourse/models/composer";
 import showModal from "discourse/lib/show-modal";
 import {
@@ -7,7 +8,7 @@ import {
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import PermissionType from "discourse/models/permission-type";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   navMode: "latest",
 
   queryParams,
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.es6
index dd5b8e444b..74556b57fc 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { default as Topic, ID_CONSTRAINT } from "discourse/models/topic";
 import DiscourseURL from "discourse/lib/url";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model(params) {
     if (params.slugOrId.match(ID_CONSTRAINT)) {
       return { url: `/t/topic/${params.slugOrId}` };
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index c193cbe98c..c3d0e6cf72 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,8 +1,9 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
 
 // This route is used for retrieving a topic based on params
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   // Avoid default model hook
   model(params) {
     return params;
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 4782d2dab8..e4b168ec7a 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,3 +1,4 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 
@@ -9,7 +10,7 @@ const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
-const TopicRoute = Discourse.Route.extend({
+const TopicRoute = DiscourseRoute.extend({
   redirect() {
     return this.redirectIfLoginRequired();
   },
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js.es6
index 4b2b993549..3df278df6f 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js.es6
+++ b/app/assets/javascripts/discourse/routes/unknown.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     return ajax("/404-body", { dataType: "html" });
   }
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
index 2ca94b05e5..392b9a6255 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     let userDraftsStream = this.modelFor("user").get("userDraftsStream");
     return userDraftsStream.load(this.site).then(() => userDraftsStream);
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
index 8d9d1e8144..1aea1056cf 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   queryParams: {
     acting_username: { refreshModel: true }
   },
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js.es6
index a827e3d998..f36beaf1d5 100644
--- a/app/assets/javascripts/discourse/routes/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   model() {
     let user = this.modelFor("user");
     if (user.get("profile_hidden")) {
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js.es6
index 0efe8069fc..ffe6008da9 100644
--- a/app/assets/javascripts/discourse/routes/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-badges.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 import UserBadge from "discourse/models/user-badge";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   model() {
     return UserBadge.findByUsername(
       this.modelFor("user").get("username_lower"),
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js.es6
index eef87b16eb..ca51d8fce9 100644
--- a/app/assets/javascripts/discourse/routes/user-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel() {
     const { currentUser } = this;
     const viewingMe =
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
index bf7a358215..721f4fb8b2 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   beforeModel: function() {
     this.replaceWith("userInvited.show", "pending");
   }
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
index 54f367b739..3cd83f79ce 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Invite from "discourse/models/invite";
 import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model(params) {
     Invite.findInvitedCount(this.modelFor("user")).then(result =>
       this.set("invitesCount", result)
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
index 1e998969a3..28f0041253 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   controllerName: "user-notifications",
   renderTemplate() {
     this.render("user/notifications-index");
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
index e4e65c7f9b..3feb837746 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   renderTemplate() {
     this.render("user/notifications");
   },
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.es6
index 7007920e38..baf5ae81d1 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   model() {
     const username = this.modelFor("user").get("username_lower");
     return ajax(`/tags/personal_messages/${username}`)
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
index 56e0099438..ef6854e056 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
@@ -1,7 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import Draft from "discourse/models/draft";
 import Composer from "discourse/models/composer";
 
-export default Discourse.Route.extend({
+export default DiscourseRoute.extend({
   renderTemplate() {
     this.render("user/messages");
   },
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js.es6
index 698d2f4edc..6827063517 100644
--- a/app/assets/javascripts/discourse/routes/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-summary.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   showFooter: true,
 
   model() {
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
index c82e0dceea..80f2c66734 100644
--- a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
@@ -1,6 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ViewingActionType, {
+export default DiscourseRoute.extend(ViewingActionType, {
   renderTemplate() {
     this.render("user-topics-list");
   },
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 4eaaa4c910..af8d85ccf0 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   titleToken() {
     const username = this.modelFor("user").username;
     if (username) {
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index 009ee9e88d..b500a985b5 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
   queryParams: {
     period: { refreshModel: true },
     order: { refreshModel: true },
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb
index 998eff2a6f..4766f115e9 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-index.js.es6.erb
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from 'discourse/routes/discourse'
+
+export default DiscourseRoute.extend({
   controllerName: "actions-index",
 
   model(params) {
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb
index 74274ebe3a..34ef38ac50 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route-show.js.es6.erb
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from 'discourse/routes/discourse'
+
+export default DiscourseRoute.extend({
   controllerName: "actions-show",
 
   model(params) {
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb
index be3f4f1241..702e29cdfd 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/routes/route.js.es6.erb
@@ -1,4 +1,6 @@
-export default Discourse.Route.extend({
+import DiscourseRoute from 'discourse/routes/discourse'
+
+export default DiscourseRoute.extend({
   controllerName: "actions",
 
   renderTemplate() {

From 283a0add8070cea294ad2cb9f5dbf7fd15b22a3d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 22 Oct 2019 09:47:27 -0400
Subject: [PATCH 124/328] Support for importing `@ember/component` and
 `@ember/routing/route` (#8214)

This will allow us to take the first step in updating our modules
to be consistent with example Ember code and to align with Ember CLI.
---
 app/assets/javascripts/discourse-loader.js        | 15 ++++++++++++++-
 .../discourse/components/d-modal.js.es6           |  3 ++-
 .../javascripts/discourse/routes/discourse.js.es6 |  3 ++-
 .../discourse/routes/group-activity-index.js.es6  |  4 +++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 35378f42f7..8d2d9ffb97 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,6 +1,15 @@
 var define, requirejs;
 
 (function() {
+  // In future versions of ember we don't need this
+  var EMBER_MODULES = {};
+  if (typeof Ember !== "undefined") {
+    EMBER_MODULES = {
+      "@ember/component": { default: Ember.Component },
+      "@ember/routing/route": { default: Ember.Route }
+    };
+  }
+
   var _isArray;
   if (!Array.isArray) {
     _isArray = function(x) {
@@ -111,7 +120,7 @@ var define, requirejs;
   }
 
   function requireFrom(name, origin) {
-    var mod = registry[name];
+    var mod = EMBER_MODULES[name] || registry[name];
     if (!mod) {
       throw new Error(
         "Could not find module `" + name + "` imported from `" + origin + "`"
@@ -125,6 +134,10 @@ var define, requirejs;
   }
 
   requirejs = require = function(name) {
+    if (EMBER_MODULES[name]) {
+      return EMBER_MODULES[name];
+    }
+
     var mod = registry[name];
 
     if (mod && mod.callback instanceof Alias) {
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 8c46fc48e1..b8dbcc4967 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,6 +1,7 @@
 import { on } from "ember-addons/ember-computed-decorators";
+import Component from "@ember/component";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [
     ":modal",
     ":d-modal",
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 51bdcbbc2b..fb828bddd1 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,7 +1,8 @@
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
+import Route from "@ember/routing/route";
 
-const DiscourseRoute = Ember.Route.extend({
+const DiscourseRoute = Route.extend({
   showFooter: false,
 
   // Set to true to refresh a model without a transition if a query param
diff --git a/app/assets/javascripts/discourse/routes/group-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-index.js.es6
index 4ad23d5f64..de7b551a80 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-index.js.es6
@@ -1,4 +1,6 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+
+export default Route.extend({
   beforeModel() {
     const group = this.modelFor("group");
     if (group.can_see_members) {

From 7d09af7edaa132c394b7031fdfbcfeb4f970ce2d Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 22 Oct 2019 08:44:52 -0600
Subject: [PATCH 125/328] FIX: Prevent null-byte searches causing 500 error
 (#8226)

This fix ensures that searches that contain a null byte return a 400
error instead of causing a 500 error.

For some reason from rspec we will reach the raise statement inside
of the `rescue_from ArgumentError` block, but outside of rspec it will
not execute the raise statement and so a 500 is thrown instead of
reaching the `rescue_from Discourse::InvalidParameters` block inside of
the application controller.

This fix raises Discourse::InvalidParameters directly from the search
controller instead of relying on `PG::Connection.escape_string` to
raise the `ArgumentError`.
---
 app/controllers/search_controller.rb    | 8 ++++++++
 spec/requests/search_controller_spec.rb | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 919303e3be..4fea08f068 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -24,6 +24,10 @@ class SearchController < ApplicationController
       raise Discourse::InvalidParameters.new(:q)
     end
 
+    if @search_term.present? && @search_term.include?("\u0000")
+      raise Discourse::InvalidParameters.new("string contains null byte")
+    end
+
     search_args = {
       type_filter: 'topic',
       guardian: guardian,
@@ -68,6 +72,10 @@ class SearchController < ApplicationController
   def query
     params.require(:term)
 
+    if params[:term].include?("\u0000")
+      raise Discourse::InvalidParameters.new("string contains null byte")
+    end
+
     search_args = { guardian: guardian }
 
     search_args[:type_filter] = params[:type_filter]                 if params[:type_filter].present?
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index f583be479f..72dc29a004 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -197,6 +197,13 @@ describe SearchController do
       expect(response.status).to eq(400)
     end
 
+    it "returns a 400 error if you search for null bytes" do
+      term = "hello\0hello"
+
+      get "/search.json", params: { q: term }
+      expect(response.status).to eq(400)
+    end
+
     it "logs the search term" do
       SiteSetting.log_search_queries = true
       get "/search.json", params: { q: 'bantha' }

From e112369bb6ceb868967d07d698018f4ca607d34a Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Tue, 22 Oct 2019 11:52:37 -0300
Subject: [PATCH 126/328] FIX: Exclude image_url from
 web_hook_topic_view_serializer

---
 app/serializers/web_hook_topic_view_serializer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/serializers/web_hook_topic_view_serializer.rb b/app/serializers/web_hook_topic_view_serializer.rb
index 90defd183f..76dc381883 100644
--- a/app/serializers/web_hook_topic_view_serializer.rb
+++ b/app/serializers/web_hook_topic_view_serializer.rb
@@ -20,6 +20,7 @@ class WebHookTopicViewSerializer < TopicViewSerializer
     topic_timer
     private_topic_timer
     details
+    image_url
   }.each do |attr|
     define_method("include_#{attr}?") do
       false

From a411806551dbbc46c27b7df3579b9b2b0c7214b6 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Tue, 22 Oct 2019 12:05:36 -0300
Subject: [PATCH 127/328] FIX: Return blank avatar when downloading an avatar
 is not possible due to file size

---
 app/controllers/user_avatars_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 288fb8bc3f..13fc1f8cd9 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -160,6 +160,9 @@ class UserAvatarsController < ApplicationController
         follow_redirect: true,
         read_timeout: 10
       )
+
+      return render_blank if tmp.nil?
+
       FileUtils.mv tmp.path, path
     end
 

From 51ecbeef4df9baf6262aae633d02a918f8c9a6f0 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 22 Oct 2019 18:00:12 +0200
Subject: [PATCH 128/328] DEV: Upgrade lefthook

`yarn install` didn't work on a fresh system
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b6cf230737..a335185a05 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "workbox-sw": "^4.3.1"
   },
   "devDependencies": {
-    "@arkweid/lefthook": "^0.5.6",
+    "@arkweid/lefthook": "^0.6.3",
     "babel-eslint": "^8.2",
     "chrome-launcher": "^0.10",
     "chrome-remote-interface": "^0.25",
diff --git a/yarn.lock b/yarn.lock
index 7cab56fcba..c0533e3dff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@arkweid/lefthook@^0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@arkweid/lefthook/-/lefthook-0.5.6.tgz#6c44bc257c2ea2c2498c25df1757fd224a69a088"
-  integrity sha512-hnzXNq/tq7LZGOFE1CigEdSOd1lkhJpUX83pyseIQg7hzrwytnm3+qVLqnMAY/Zk/L7kvWVLXiYxJofDc+2TNg==
+"@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==
 
 "@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"

From 1e9d9d9346c946670097d8114493dc6cb49dedf0 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 22 Oct 2019 22:41:04 +0530
Subject: [PATCH 129/328] FIX: respect `tl3 links no follow` setting (#8232)

---
 lib/cooked_post_processor.rb                  |  5 +--
 spec/components/cooked_post_processor_spec.rb | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 00c50e5b9a..a6dfd64218 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -28,6 +28,7 @@ class CookedPostProcessor
     @size_cache = {}
 
     @disable_loading_image = !!opts[:disable_loading_image]
+    @omit_nofollow = post.omit_nofollow?
   end
 
   def post_process(bypass_bump: false, new_post: false)
@@ -580,7 +581,7 @@ class CookedPostProcessor
       end
     end
 
-    if @cooking_options[:omit_nofollow] || !SiteSetting.add_rel_nofollow_to_user_content
+    if @omit_nofollow || !SiteSetting.add_rel_nofollow_to_user_content
       @doc.css(".onebox-body a, .onebox a").each { |a| a.remove_attribute("rel") }
     end
   end
@@ -617,7 +618,7 @@ class CookedPostProcessor
   end
 
   def enforce_nofollow
-    if !@cooking_options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
+    if !@omit_nofollow && SiteSetting.add_rel_nofollow_to_user_content
       PrettyText.add_rel_nofollow_to_user_content(@doc)
     end
   end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 6e5d82bfdf..5888433f63 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -199,6 +199,12 @@ describe CookedPostProcessor do
           RAW
         end
 
+        let(:staff_post) do
+          Fabricate(:post, user: Fabricate(:admin), raw: <<~RAW)
+          This is a #{url_with_path} topic
+          RAW
+        end
+
         before do
           urls.each do |url|
             stub_request(:get, url).to_return(
@@ -247,6 +253,14 @@ describe CookedPostProcessor do
             text: title,
             count: 1
           )
+
+          expect(html).to have_tag("a[rel='nofollow noopener']")
+        end
+
+        it 'removes nofollow if user is staff/tl3' do
+          cpp = CookedPostProcessor.new(staff_post, invalidate_oneboxes: true)
+          cpp.post_process
+          expect(cpp.html).to_not have_tag("a[rel='nofollow noopener']")
         end
       end
     end
@@ -876,6 +890,27 @@ describe CookedPostProcessor do
     end
   end
 
+  context "#post_process_oneboxes removes nofollow if user is tl3" do
+    let(:post) { build(:post_with_youtube, id: 123) }
+    let(:cpp) { CookedPostProcessor.new(post, invalidate_oneboxes: true) }
+
+    before do
+      post.user.trust_level = TrustLevel[3]
+      post.user.save!
+      SiteSetting.add_rel_nofollow_to_user_content = true
+      SiteSetting.tl3_links_no_follow = false
+      Oneboxer.expects(:onebox)
+        .with("http://www.youtube.com/watch?v=9bZkp7q19f0", invalidate_oneboxes: true, user_id: nil, category_id: post.topic.category_id)
+        .returns('<aside class="onebox"><a href="https://www.youtube.com/watch?v=9bZkp7q19f0" rel="nofollow noopener">GANGNAM STYLE</a></aside>')
+      cpp.post_process_oneboxes
+    end
+
+    it "removes nofollow noopener from links" do
+      expect(cpp).to be_dirty
+      expect(cpp.html).to match_html '<aside class="onebox"><a href="https://www.youtube.com/watch?v=9bZkp7q19f0">GANGNAM STYLE</a></aside>'
+    end
+  end
+
   context "#post_process_oneboxes with oneboxed image" do
     let(:post) { build(:post_with_youtube, id: 123) }
     let(:cpp) { CookedPostProcessor.new(post, invalidate_oneboxes: true) }

From 2ab6a68629bdc25ad8d1862c63f431715bab6376 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 22 Oct 2019 14:19:24 -0400
Subject: [PATCH 130/328] UX: Standardize tag display in search menu results

This allows theme components (like discourse-tag-icons) to apply to tag results in search menu.
---
 .../discourse/widgets/search-menu-results.js.es6         | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
index 83439e9232..636c069f94 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -6,6 +6,7 @@ import { h } from "virtual-dom";
 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";
 
 class Highlighted extends RawHtml {
   constructor(html, term) {
@@ -70,13 +71,7 @@ createSearchResult({
   linkField: "url",
   builder(t) {
     const tag = escapeExpression(t.id);
-    return h(
-      "span",
-      {
-        className: `tag-${tag} discourse-tag ${Discourse.SiteSettings.tag_style}`
-      },
-      tag
-    );
+    return new RawHtml({ html: renderTag(tag, { tagName: "span" }) });
   }
 });
 

From d4f1e6d11b9f53fbfc9866ff3762680fb0b9488a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 22 Oct 2019 16:32:24 -0400
Subject: [PATCH 131/328] UX: update disabled dropdowns style w/ color
 variables

---
 app/assets/stylesheets/common/base/user.scss              | 2 +-
 app/assets/stylesheets/common/select-kit/combo-box.scss   | 8 ++++++--
 .../stylesheets/common/select-kit/multi-select.scss       | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index da5bbb3ef3..872661991c 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -673,7 +673,7 @@
 
         &:focus {
           box-shadow: none;
-          border-color: #e9e9e9;
+          border-color: $primary-low;
         }
       }
 
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index 8b6b4d731e..2894b4782a 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -78,8 +78,12 @@
 
     &.is-disabled {
       .select-kit-header {
-        background: #e9e9e9;
-        border-color: #ddd;
+        background: $primary-low;
+        border-color: $primary-low-mid;
+        color: $primary-medium;
+        .d-icon {
+          color: $primary-medium;
+        }
       }
     }
 
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index ca36edb38e..beff607eee 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -33,8 +33,12 @@
 
     &.is-disabled {
       .multi-select-header {
-        background: #e9e9e9;
-        border-color: #ddd;
+        background: $primary-low;
+        border-color: $primary-low-mid;
+        color: $primary-medium;
+        .d-icon {
+          color: $primary-medium;
+        }
       }
     }
 

From 67ad8fbd1b33ae1258d60391986c4ea1ea3c026a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 22 Oct 2019 16:45:23 -0400
Subject: [PATCH 132/328] minor button styling for admin login

---
 app/views/users/admin_login.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/admin_login.html.erb b/app/views/users/admin_login.html.erb
index 42d3a5e637..b8bca6efff 100644
--- a/app/views/users/admin_login.html.erb
+++ b/app/views/users/admin_login.html.erb
@@ -49,7 +49,7 @@
   <%=form_tag({}, method: :put) do %>
     <%= label_tag(:email, t('admin_login.email_input')) %>
     <%= text_field_tag(:email, nil, autofocus: true) %><br><br>
-    <%= submit_tag t('admin_login.submit_button') %>
+    <%= submit_tag t('admin_login.submit_button'), class: "btn btn-primary" %>
   <% end %>
 <% end %>
 

From ab6a540fc43f0093d36d7d98c978563485e6409e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 22 Oct 2019 23:10:18 -0400
Subject: [PATCH 133/328] UX: fixes regression with iOS composer

Fixes a bug introduced in e83c2488a2d9c686fde83cef93878ee4a9d0f119 where dismissing the keyboard in iOS would not minimize the composer.
---
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index b8a4b8c02b..e613ba16e3 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -117,7 +117,7 @@ function positioningWorkaround($fixedElement) {
     if (
       lastTouchedElement &&
       ($(lastTouchedElement).hasClass("select-kit-header") ||
-        $(lastTouchedElement).closest(".autocomplete") ||
+        $(lastTouchedElement).closest(".autocomplete").length ||
         ["span", "svg", "button"].includes(
           lastTouchedElement.nodeName.toLowerCase()
         ))

From 676c432b0faf3c7d6d51b40b6a0e806d685c44a1 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 23 Oct 2019 16:09:55 +1100
Subject: [PATCH 134/328] FIX: notifications are missing under certain
 conditions

This simplifies the code for refreshing notification counts. It now
unconditionally looks up the user object which protects against stale objects
in memory.

This also removes a pile of conditional logic we no longer need.
---
 app/models/notification.rb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 0d2a232b61..b39fc97ac0 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -217,15 +217,8 @@ class Notification < ActiveRecord::Base
   protected
 
   def refresh_notification_count
-    begin
-      if user.has_attribute?(:seen_notification_id)
-        user.notifications.reset
-        user.publish_notifications_state
-      else
-        User.find_by(id: user.id).publish_notifications_state
-      end
-    rescue ActiveRecord::RecordNotFound
-      # happens when we delete a user
+    if user_id
+      User.find_by(id: user_id)&.publish_notifications_state
     end
   end
 

From 950da348269a4f724b368fd8297131cd43fe41f8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 23 Oct 2019 16:18:41 +1100
Subject: [PATCH 135/328] DEV: waiting for 10ms is hardly enough

tests that test thread behavior and rely on scheduling need to allow for
a wider amount of error margin
---
 spec/components/scheduler/defer_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb
index c5ac81786b..533e2ff380 100644
--- a/spec/components/scheduler/defer_spec.rb
+++ b/spec/components/scheduler/defer_spec.rb
@@ -94,7 +94,7 @@ describe Scheduler::Defer do
   it "recovers from a crash / fork" do
     s = nil
     @defer.stop!
-    wait_for(10) do
+    wait_for(1000) do
       @defer.stopped?
     end
     # hack allow thread to die
@@ -104,7 +104,7 @@ describe Scheduler::Defer do
       s = "good"
     end
 
-    wait_for(10) do
+    wait_for(1000) do
       s == "good"
     end
 
@@ -118,7 +118,7 @@ describe Scheduler::Defer do
       s = "good"
     end
 
-    wait_for(10) do
+    wait_for(1000) do
       s == "good"
     end
 

From f69dacf979317946ed4a3e81e85fcca1b45bedf0 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 23 Oct 2019 17:23:50 +1100
Subject: [PATCH 136/328] FIX: Reconnect in restore process connects to correct
 DB (#8218)

Simplified flow of restore is like that
```
migrate_database
reconnect
extract_uploads
```

Problem with incorrect current database started with this fix https://github.com/discourse/discourse/commit/025d4ee91f4

Dump task is reconnecting to default database https://github.com/rails/rails/blob/master/activerecord/lib/active_record/railties/databases.rake#L429

And then, we are trying to reconnect to the original database with that code:
```
def reconnect_database
  log "Reconnecting to the database..."
  RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
end
```

This reconnect is not switching us back to correct database because of that check
https://github.com/discourse/rails_multisite/blob/master/lib/rails_multisite/connection_management.rb#L181
Basically, it finds existing handler and it thinks that we are connected to correct DB and this step can be skipped.

To solve it, we can reload RailsMultisite::ConnectionManagement which creates a new instance of that class
https://github.com/discourse/rails_multisite/blob/master/lib/rails_multisite/connection_management.rb#L38
---
 lib/backup_restore/restorer.rb           |  1 +
 spec/lib/backup_restore/restorer_spec.rb | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 42fd2db39f..1efceafd12 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -404,6 +404,7 @@ module BackupRestore
 
     def reconnect_database
       log "Reconnecting to the database..."
+      RailsMultisite::ConnectionManagement::reload
       RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
     end
 
diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index 2968156d94..3ae24d76c7 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -100,4 +100,26 @@ describe BackupRestore::Restorer do
       @restorer.copy_archive_to_tmp_directory
     end
   end
+
+  context 'Database connection' do
+    fab!(:admin) { Fabricate(:admin) }
+    before do
+      SiteSetting.allow_restore = true
+      @restore_path = File.join(Rails.root, 'public', 'backups', RailsMultisite::ConnectionManagement.current_db)
+      described_class.any_instance.stubs(ensure_we_have_a_filename: true)
+      described_class.any_instance.stubs(initialize_state: true)
+    end
+    let(:conn) { RailsMultisite::ConnectionManagement }
+    let(:restorer) { described_class.new(admin.id) }
+
+    it 'correctly reconnects to database' do
+      restorer.instance_variable_set(:@current_db, 'second')
+      conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
+      conn.establish_connection(db: 'second')
+      expect(RailsMultisite::ConnectionManagement.current_db).to eq('second')
+      ActiveRecord::Base.connection_pool.spec.config[:db_key] = "incorrect_db"
+      restorer.send(:reconnect_database)
+      expect(RailsMultisite::ConnectionManagement.current_db).to eq('second')
+    end
+  end
 end

From f34a0141c75e00c249442c6482546482e371ede1 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 23 Oct 2019 17:27:14 +1100
Subject: [PATCH 137/328] FIX: Correct path to ImportExport module (#8227)

During the move from Classic autoloader to Zeitwerk import_export module was moved to correct file name convention.
https://github.com/discourse/discourse/commit/427d54b2b00fa94474c0522eaed750452c4e7f43#diff-d896ec33b95afb7fae9f8bfe73d0580b

Problem is that export/import is still using old path to require that module

Meta: https://meta.discourse.org/t/topic-and-category-export-import/38930/40
---
 lib/tasks/export.rake | 4 ++--
 lib/tasks/import.rake | 2 +-
 script/discourse      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/export.rake b/lib/tasks/export.rake
index d1d4e3826d..ab1b9138eb 100644
--- a/lib/tasks/export.rake
+++ b/lib/tasks/export.rake
@@ -2,7 +2,7 @@
 
 desc 'Export all the categories'
 task 'export:categories', [:category_ids] => [:environment] do |_, args|
-  require "import_export/import_export"
+  require "import_export"
   ids = args[:category_ids].split(" ")
 
   ImportExport.export_categories(ids)
@@ -11,7 +11,7 @@ end
 
 desc 'Export only the structure of all categories'
 task 'export:category_structure', [:include_group_users, :file_name] => [:environment] do |_, args|
-  require "import_export/import_export"
+  require "import_export"
 
   ImportExport.export_category_structure(args[:include_group_users], args[:file_name])
   puts "", "Done", ""
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 92c4b90a55..c0fbefed8f 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -507,7 +507,7 @@ end
 
 desc 'Import existing exported file'
 task 'import:file', [:file_name] => [:environment] do |_, args|
-  require "import_export/import_export"
+  require "import_export"
 
   ImportExport.import(args[:file_name])
   puts "", "Done", ""
diff --git a/script/discourse b/script/discourse
index 97b47861da..e1d7b13cfc 100755
--- a/script/discourse
+++ b/script/discourse
@@ -264,7 +264,7 @@ class DiscourseCLI < Thor
   end
 
   def load_import_export
-    require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export/import_export")
+    require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export")
   end
 
   def do_remap(from, to, regex = false)

From 1a72a61822f78578c79e6f5ab1ffaef2b052826b Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 23 Oct 2019 09:43:00 +0100
Subject: [PATCH 138/328] FIX: Fixed testsuite

The backup restorer tests weren't cleaning up after themselves and
playing poorly with prefabrication.
---
 spec/lib/backup_restore/restorer_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index 3ae24d76c7..8bd311580f 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -21,7 +21,7 @@ describe BackupRestore::Restorer do
   end
 
   describe 'Decompressing a backup' do
-    fab!(:admin) { Fabricate(:admin) }
+    let!(:admin) { Fabricate(:admin) }
 
     before do
       SiteSetting.allow_restore = true
@@ -102,13 +102,16 @@ describe BackupRestore::Restorer do
   end
 
   context 'Database connection' do
-    fab!(:admin) { Fabricate(:admin) }
+    let!(:admin) { Fabricate(:admin) }
     before do
       SiteSetting.allow_restore = true
       @restore_path = File.join(Rails.root, 'public', 'backups', RailsMultisite::ConnectionManagement.current_db)
       described_class.any_instance.stubs(ensure_we_have_a_filename: true)
       described_class.any_instance.stubs(initialize_state: true)
     end
+    after do
+      conn.establish_connection(db: 'default')
+    end
     let(:conn) { RailsMultisite::ConnectionManagement }
     let(:restorer) { described_class.new(admin.id) }
 

From 09a569aabac7ed2f58d52aaa97f683194dd96814 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 23 Oct 2019 12:27:56 +0300
Subject: [PATCH 139/328] PERF: Add unique index oauth2_user_infos(user_id,
 provider) (#8230)

---
 app/models/oauth2_user_info.rb                             | 3 ++-
 db/migrate/20191022155215_add_index_to_oauth2_user_info.rb | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20191022155215_add_index_to_oauth2_user_info.rb

diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb
index ed9f217caa..69f35ed731 100644
--- a/app/models/oauth2_user_info.rb
+++ b/app/models/oauth2_user_info.rb
@@ -20,5 +20,6 @@ end
 #
 # Indexes
 #
-#  index_oauth2_user_infos_on_uid_and_provider  (uid,provider) UNIQUE
+#  index_oauth2_user_infos_on_uid_and_provider      (uid,provider) UNIQUE
+#  index_oauth2_user_infos_on_user_id_and_provider  (user_id,provider) UNIQUE
 #
diff --git a/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb b/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb
new file mode 100644
index 0000000000..dc9093a6c0
--- /dev/null
+++ b/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexToOauth2UserInfo < ActiveRecord::Migration[6.0]
+  def change
+    add_index :oauth2_user_infos, [:user_id, :provider], unique: true
+  end
+end

From a7301c86718fcc7675f9c1e20f169d9734f2d201 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 23 Oct 2019 12:30:43 +0300
Subject: [PATCH 140/328] PERF: Add index on group to category_groups (#8231)

---
 app/models/category_group.rb                               | 4 ++++
 ...20191022161944_add_index_on_group_to_category_groups.rb | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 db/migrate/20191022161944_add_index_on_group_to_category_groups.rb

diff --git a/app/models/category_group.rb b/app/models/category_group.rb
index a0cbb3f31e..a4f5b51ef9 100644
--- a/app/models/category_group.rb
+++ b/app/models/category_group.rb
@@ -23,3 +23,7 @@ end
 #  updated_at      :datetime         not null
 #  permission_type :integer          default(1)
 #
+# Indexes
+#
+#  index_category_groups_on_group_id  (group_id)
+#
diff --git a/db/migrate/20191022161944_add_index_on_group_to_category_groups.rb b/db/migrate/20191022161944_add_index_on_group_to_category_groups.rb
new file mode 100644
index 0000000000..ba3578ca9b
--- /dev/null
+++ b/db/migrate/20191022161944_add_index_on_group_to_category_groups.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexOnGroupToCategoryGroups < ActiveRecord::Migration[6.0]
+  def change
+    add_index :category_groups, :group_id
+  end
+end

From 4fa1ef094574d6e943e2f392b5daaac5a93c7aa0 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 23 Oct 2019 10:44:47 -0400
Subject: [PATCH 141/328] UX: Improve quoting on iOS

Fixes quote usability on iOS when the button is near the right edge of the screen.
---
 .../javascripts/discourse/components/quote-button.js.es6   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index 0bde5b4ffa..9ac01abef4 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -107,10 +107,13 @@ export default Ember.Component.extend({
       let left = markerOffset.left + Math.max(0, parentScrollLeft);
 
       if (showAtEnd) {
-        top = top + 20;
+        const nearRightEdgeOfScreen =
+          $(window).width() - $quoteButton.outerWidth() < left + 10;
+
+        top = nearRightEdgeOfScreen ? top + 50 : top + 20;
         left = Math.min(
           left + 10,
-          $(window).width() - $quoteButton.outerWidth()
+          $(window).width() - $quoteButton.outerWidth() - 10
         );
       } else {
         top = top - $quoteButton.outerHeight() - 5;

From 3db61aa18a9952edf63a5aab30c24f666418a25a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 23 Oct 2019 17:10:10 +0200
Subject: [PATCH 142/328] UX: applies correct background to <select> on dark
 themes (#8234)

---
 app/assets/stylesheets/desktop/discourse.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index bdab807843..970c81f1f3 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -79,6 +79,8 @@ input[type="file"] {
 
 select {
   width: 220px;
+  background: $secondary;
+
   &[multiple],
   &[size] {
     height: auto;

From a8a76198b146d06ce6793d0e0514a8ca93bc993c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 12:30:52 -0400
Subject: [PATCH 143/328] REFACTOR: Remove `Ember.Component` global variable

Use imports instead.
---
 app/assets/javascripts/admin/components/ace-editor.js.es6      | 3 ++-
 .../javascripts/admin/components/admin-backups-logs.js.es6     | 3 ++-
 .../javascripts/admin/components/admin-directory-toggle.js.es6 | 3 ++-
 .../javascripts/admin/components/admin-editable-field.js.es6   | 3 ++-
 app/assets/javascripts/admin/components/admin-form-row.js.es6  | 3 ++-
 app/assets/javascripts/admin/components/admin-graph.js.es6     | 3 ++-
 app/assets/javascripts/admin/components/admin-nav.js.es6       | 3 ++-
 .../javascripts/admin/components/admin-report-chart.js.es6     | 3 ++-
 .../javascripts/admin/components/admin-report-counters.js.es6  | 3 ++-
 .../javascripts/admin/components/admin-report-counts.js.es6    | 3 ++-
 .../admin/components/admin-report-inline-table.js.es6          | 3 ++-
 .../admin/components/admin-report-per-day-counts.js.es6        | 3 ++-
 .../admin/components/admin-report-stacked-chart.js.es6         | 3 ++-
 .../admin/components/admin-report-storage-stats.js.es6         | 3 ++-
 .../admin/components/admin-report-table-cell.js.es6            | 3 ++-
 .../admin/components/admin-report-table-header.js.es6          | 3 ++-
 .../javascripts/admin/components/admin-report-table-row.js.es6 | 3 ++-
 .../javascripts/admin/components/admin-report-table.js.es6     | 3 ++-
 .../admin/components/admin-report-trust-level-counts.js.es6    | 3 ++-
 app/assets/javascripts/admin/components/admin-report.js.es6    | 3 ++-
 .../javascripts/admin/components/admin-theme-editor.js.es6     | 3 ++-
 .../javascripts/admin/components/admin-user-field-item.js.es6  | 3 ++-
 .../javascripts/admin/components/admin-watched-word.js.es6     | 3 ++-
 .../admin/components/admin-web-hook-event-chooser.js.es6       | 3 ++-
 .../javascripts/admin/components/admin-web-hook-event.js.es6   | 3 ++-
 .../javascripts/admin/components/admin-web-hook-status.js.es6  | 3 ++-
 app/assets/javascripts/admin/components/admin-wrapper.js.es6   | 3 ++-
 app/assets/javascripts/admin/components/cancel-link.js.es6     | 3 ++-
 app/assets/javascripts/admin/components/color-input.js.es6     | 3 ++-
 .../javascripts/admin/components/email-styles-editor.js.es6    | 3 ++-
 app/assets/javascripts/admin/components/embeddable-host.js.es6 | 3 ++-
 .../javascripts/admin/components/embedding-setting.js.es6      | 3 ++-
 app/assets/javascripts/admin/components/flag-user-lists.js.es6 | 3 ++-
 .../javascripts/admin/components/highlighted-code.js.es6       | 3 ++-
 .../javascripts/admin/components/inline-edit-checkbox.js.es6   | 3 ++-
 .../javascripts/admin/components/install-theme-item.js.es6     | 3 ++-
 app/assets/javascripts/admin/components/ip-lookup.js.es6       | 3 ++-
 .../admin/components/moderation-history-item.js.es6            | 3 ++-
 .../javascripts/admin/components/penalty-post-action.js.es6    | 3 ++-
 app/assets/javascripts/admin/components/permalink-form.js.es6  | 3 ++-
 .../javascripts/admin/components/report-filters/filter.js.es6  | 3 ++-
 .../javascripts/admin/components/resumable-upload.js.es6       | 3 ++-
 app/assets/javascripts/admin/components/save-controls.js.es6   | 3 ++-
 .../admin/components/screened-ip-address-form.js.es6           | 3 ++-
 .../javascripts/admin/components/secret-value-list.js.es6      | 3 ++-
 app/assets/javascripts/admin/components/silence-details.js.es6 | 3 ++-
 app/assets/javascripts/admin/components/site-setting.js.es6    | 3 ++-
 .../javascripts/admin/components/site-settings/bool.js.es6     | 3 ++-
 .../admin/components/site-settings/category-list.js.es6        | 3 ++-
 .../admin/components/site-settings/group-list.js.es6           | 3 ++-
 .../admin/components/site-settings/uploaded-image-list.js.es6  | 3 ++-
 .../javascripts/admin/components/site-text-summary.js.es6      | 3 ++-
 app/assets/javascripts/admin/components/staff-actions.js.es6   | 3 ++-
 .../javascripts/admin/components/suspension-details.js.es6     | 3 ++-
 app/assets/javascripts/admin/components/tags-uploader.js.es6   | 3 ++-
 .../javascripts/admin/components/theme-setting-editor.js.es6   | 3 ++-
 .../javascripts/admin/components/theme-translation.js.es6      | 3 ++-
 .../javascripts/admin/components/themes-list-item.js.es6       | 3 ++-
 app/assets/javascripts/admin/components/themes-list.js.es6     | 3 ++-
 app/assets/javascripts/admin/components/value-list.js.es6      | 3 ++-
 .../javascripts/admin/components/watched-word-form.js.es6      | 3 ++-
 .../javascripts/admin/components/watched-word-uploader.js.es6  | 3 ++-
 .../javascripts/discourse/components/about-page-users.js.es6   | 3 ++-
 .../discourse/components/activation-controls.js.es6            | 3 ++-
 .../discourse/components/add-category-tag-classes.js.es6       | 3 ++-
 .../javascripts/discourse/components/avatar-uploader.js.es6    | 3 ++-
 .../javascripts/discourse/components/backup-codes.js.es6       | 3 ++-
 .../javascripts/discourse/components/backup-uploader.js.es6    | 3 ++-
 .../javascripts/discourse/components/badge-button.js.es6       | 3 ++-
 app/assets/javascripts/discourse/components/badge-card.js.es6  | 3 ++-
 .../javascripts/discourse/components/badge-selector.js.es6     | 3 ++-
 app/assets/javascripts/discourse/components/badge-title.js.es6 | 3 ++-
 .../javascripts/discourse/components/basic-topic-list.js.es6   | 3 ++-
 .../javascripts/discourse/components/bread-crumbs.js.es6       | 3 ++-
 .../javascripts/discourse/components/bulk-select-button.js.es6 | 3 ++-
 .../discourse/components/categories-and-latest-topics.js.es6   | 3 ++-
 .../discourse/components/categories-and-top-topics.js.es6      | 3 ++-
 .../discourse/components/categories-boxes-topic.js.es6         | 3 ++-
 .../discourse/components/categories-boxes-with-topics.js.es6   | 3 ++-
 .../javascripts/discourse/components/categories-boxes.js.es6   | 3 ++-
 .../javascripts/discourse/components/categories-only.js.es6    | 3 ++-
 .../discourse/components/categories-topic-list.js.es6          | 3 ++-
 .../discourse/components/category-title-before.js.es6          | 3 ++-
 .../discourse/components/category-title-link.js.es6            | 3 ++-
 .../javascripts/discourse/components/category-unread.js.es6    | 3 ++-
 app/assets/javascripts/discourse/components/cdn-img.js.es6     | 3 ++-
 .../javascripts/discourse/components/choose-message.js.es6     | 3 ++-
 .../javascripts/discourse/components/choose-topic.js.es6       | 3 ++-
 .../discourse/components/color-picker-choice.js.es6            | 3 ++-
 .../javascripts/discourse/components/color-picker.js.es6       | 3 ++-
 .../discourse/components/composer-action-title.js.es6          | 3 ++-
 .../javascripts/discourse/components/composer-body.js.es6      | 3 ++-
 .../javascripts/discourse/components/composer-editor.js.es6    | 3 ++-
 .../javascripts/discourse/components/composer-message.js.es6   | 3 ++-
 .../javascripts/discourse/components/composer-messages.js.es6  | 3 ++-
 .../javascripts/discourse/components/composer-title.js.es6     | 3 ++-
 .../javascripts/discourse/components/composer-toggles.js.es6   | 3 ++-
 .../discourse/components/composer-user-selector.js.es6         | 3 ++-
 .../discourse/components/conditional-loading-section.js.es6    | 3 ++-
 .../discourse/components/conditional-loading-spinner.js.es6    | 3 ++-
 .../discourse/components/connector-container.js.es6            | 3 ++-
 app/assets/javascripts/discourse/components/cook-text.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/count-i18n.js.es6  | 3 ++-
 .../javascripts/discourse/components/create-account.js.es6     | 3 ++-
 .../discourse/components/create-topic-button.js.es6            | 3 ++-
 .../discourse/components/create-topics-notice.js.es6           | 3 ++-
 .../javascripts/discourse/components/csv-uploader.js.es6       | 3 ++-
 app/assets/javascripts/discourse/components/custom-html.js.es6 | 3 ++-
 app/assets/javascripts/discourse/components/d-button.js.es6    | 3 ++-
 app/assets/javascripts/discourse/components/d-editor.js.es6    | 3 ++-
 .../javascripts/discourse/components/d-modal-body.js.es6       | 3 ++-
 .../javascripts/discourse/components/d-modal-cancel.js.es6     | 3 ++-
 .../javascripts/discourse/components/d-navigation.js.es6       | 3 ++-
 app/assets/javascripts/discourse/components/d-section.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/date-input.js.es6  | 3 ++-
 app/assets/javascripts/discourse/components/date-picker.js.es6 | 3 ++-
 .../discourse/components/date-time-input-range.js.es6          | 3 ++-
 .../javascripts/discourse/components/date-time-input.js.es6    | 3 ++-
 .../discourse/components/desktop-notification-config.js.es6    | 3 ++-
 .../javascripts/discourse/components/directory-item.js.es6     | 3 ++-
 .../javascripts/discourse/components/directory-toggle.js.es6   | 3 ++-
 .../javascripts/discourse/components/disabled-icon.js.es6      | 3 ++-
 .../javascripts/discourse/components/discourse-banner.js.es6   | 3 ++-
 .../discourse/components/discourse-linked-text.js.es6          | 3 ++-
 .../discourse/components/discourse-tag-bound.js.es6            | 3 ++-
 .../javascripts/discourse/components/discourse-topic.js.es6    | 3 ++-
 .../discourse/components/discovery-categories.js.es6           | 3 ++-
 .../discourse/components/discovery-topics-list.js.es6          | 3 ++-
 .../discourse/components/edit-category-panel.js.es6            | 3 ++-
 .../javascripts/discourse/components/edit-category-tab.js.es6  | 3 ++-
 .../discourse/components/edit-topic-timer-form.js.es6          | 3 ++-
 .../javascripts/discourse/components/emoji-picker.js.es6       | 3 ++-
 .../javascripts/discourse/components/emoji-uploader.js.es6     | 3 ++-
 app/assets/javascripts/discourse/components/expand-post.js.es6 | 3 ++-
 .../javascripts/discourse/components/featured-topic.js.es6     | 3 ++-
 .../javascripts/discourse/components/flag-action-type.js.es6   | 3 ++-
 .../javascripts/discourse/components/flag-selection.js.es6     | 3 ++-
 app/assets/javascripts/discourse/components/flat-button.js.es6 | 3 ++-
 .../javascripts/discourse/components/footer-message.js.es6     | 3 ++-
 .../javascripts/discourse/components/future-date-input.js.es6  | 3 ++-
 .../discourse/components/generated-invite-link.js.es6          | 3 ++-
 .../javascripts/discourse/components/global-notice.js.es6      | 3 ++-
 .../javascripts/discourse/components/google-search.js.es6      | 3 ++-
 .../discourse/components/group-activity-filter.js.es6          | 3 ++-
 .../discourse/components/group-card-contents.js.es6            | 3 ++-
 .../javascripts/discourse/components/group-flair-inputs.js.es6 | 3 ++-
 .../javascripts/discourse/components/group-index-toggle.js.es6 | 3 ++-
 .../discourse/components/group-manage-logs-filter.js.es6       | 3 ++-
 .../discourse/components/group-manage-logs-row.js.es6          | 3 ++-
 .../discourse/components/group-manage-save-button.js.es6       | 3 ++-
 .../javascripts/discourse/components/group-member.js.es6       | 3 ++-
 .../discourse/components/group-members-input.js.es6            | 3 ++-
 .../discourse/components/group-membership-button.js.es6        | 3 ++-
 .../javascripts/discourse/components/group-navigation.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/group-post.js.es6  | 3 ++-
 .../javascripts/discourse/components/group-selector.js.es6     | 3 ++-
 .../discourse/components/groups-form-interaction-fields.js.es6 | 3 ++-
 .../discourse/components/groups-form-membership-fields.js.es6  | 3 ++-
 .../discourse/components/groups-form-profile-fields.js.es6     | 3 ++-
 app/assets/javascripts/discourse/components/groups-info.js.es6 | 3 ++-
 .../javascripts/discourse/components/hide-modal-trigger.js.es6 | 3 ++-
 .../javascripts/discourse/components/highlight-text.js.es6     | 3 ++-
 .../discourse/components/ignored-user-list-item.js.es6         | 3 ++-
 .../javascripts/discourse/components/ignored-user-list.js.es6  | 3 ++-
 .../javascripts/discourse/components/image-uploader.js.es6     | 3 ++-
 .../javascripts/discourse/components/images-uploader.js.es6    | 3 ++-
 app/assets/javascripts/discourse/components/input-tip.js.es6   | 3 ++-
 .../javascripts/discourse/components/invite-panel.js.es6       | 3 ++-
 .../discourse/components/latest-topic-list-item.js.es6         | 3 ++-
 .../javascripts/discourse/components/link-to-input.js.es6      | 3 ++-
 .../javascripts/discourse/components/links-redirect.js.es6     | 3 ++-
 app/assets/javascripts/discourse/components/load-more.js.es6   | 3 ++-
 .../javascripts/discourse/components/login-buttons.js.es6      | 3 ++-
 app/assets/javascripts/discourse/components/login-modal.js.es6 | 3 ++-
 .../discourse/components/mobile-category-topic.js.es6          | 3 ++-
 app/assets/javascripts/discourse/components/mobile-nav.js.es6  | 3 ++-
 app/assets/javascripts/discourse/components/modal-panel.js.es6 | 3 ++-
 app/assets/javascripts/discourse/components/modal-tab.js.es6   | 3 ++-
 .../javascripts/discourse/components/mount-widget.js.es6       | 3 ++-
 app/assets/javascripts/discourse/components/nav-item.js.es6    | 3 ++-
 .../javascripts/discourse/components/navigation-bar.js.es6     | 3 ++-
 .../javascripts/discourse/components/navigation-item.js.es6    | 3 ++-
 .../javascripts/discourse/components/plugin-connector.js.es6   | 3 ++-
 .../javascripts/discourse/components/plugin-outlet.js.es6      | 3 ++-
 .../javascripts/discourse/components/popup-input-tip.js.es6    | 3 ++-
 .../discourse/components/preference-checkbox.js.es6            | 3 ++-
 .../javascripts/discourse/components/pwa-install-banner.js.es6 | 3 ++-
 .../javascripts/discourse/components/quote-button.js.es6       | 3 ++-
 .../javascripts/discourse/components/radio-button.js.es6       | 3 ++-
 .../javascripts/discourse/components/related-messages.js.es6   | 3 ++-
 .../discourse/components/reviewable-bundled-action.js.es6      | 3 ++-
 .../discourse/components/reviewable-claimed-topic.js.es6       | 3 ++-
 .../discourse/components/reviewable-conversation-post.js.es6   | 3 ++-
 .../discourse/components/reviewable-flagged-post.js.es6        | 3 ++-
 .../discourse/components/reviewable-histories.js.es6           | 3 ++-
 .../javascripts/discourse/components/reviewable-item.js.es6    | 3 ++-
 .../discourse/components/reviewable-queued-post.js.es6         | 3 ++-
 .../javascripts/discourse/components/reviewable-user.js.es6    | 3 ++-
 .../javascripts/discourse/components/scroll-tracker.js.es6     | 3 ++-
 .../discourse/components/search-advanced-options.js.es6        | 3 ++-
 .../javascripts/discourse/components/second-factor-form.js.es6 | 3 ++-
 .../discourse/components/second-factor-input.js.es6            | 3 ++-
 .../javascripts/discourse/components/security-key-form.js.es6  | 3 ++-
 app/assets/javascripts/discourse/components/share-panel.js.es6 | 3 ++-
 app/assets/javascripts/discourse/components/share-popup.js.es6 | 3 ++-
 .../javascripts/discourse/components/share-source.js.es6       | 3 ++-
 .../discourse/components/shared-draft-controls.js.es6          | 3 ++-
 app/assets/javascripts/discourse/components/signup-cta.js.es6  | 3 ++-
 .../javascripts/discourse/components/suggested-topics.js.es6   | 3 ++-
 .../javascripts/discourse/components/tag-drop-link.js.es6      | 3 ++-
 app/assets/javascripts/discourse/components/tag-list.js.es6    | 3 ++-
 .../javascripts/discourse/components/text-overflow.js.es6      | 3 ++-
 app/assets/javascripts/discourse/components/time-input.js.es6  | 3 ++-
 .../javascripts/discourse/components/top-period-buttons.js.es6 | 3 ++-
 .../javascripts/discourse/components/topic-category.js.es6     | 3 ++-
 .../javascripts/discourse/components/topic-entrance.js.es6     | 3 ++-
 .../discourse/components/topic-footer-buttons.js.es6           | 3 ++-
 .../discourse/components/topic-join-group-notice.js.es6        | 3 ++-
 .../javascripts/discourse/components/topic-list-item.js.es6    | 3 ++-
 app/assets/javascripts/discourse/components/topic-list.js.es6  | 3 ++-
 .../javascripts/discourse/components/topic-navigation.js.es6   | 3 ++-
 .../javascripts/discourse/components/topic-post-badges.js.es6  | 3 ++-
 .../javascripts/discourse/components/topic-progress.js.es6     | 3 ++-
 .../javascripts/discourse/components/topic-status.js.es6       | 3 ++-
 .../javascripts/discourse/components/topic-timer-info.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/topic-title.js.es6 | 3 ++-
 .../javascripts/discourse/components/track-selected.js.es6     | 3 ++-
 app/assets/javascripts/discourse/components/user-badge.js.es6  | 3 ++-
 .../javascripts/discourse/components/user-card-contents.js.es6 | 3 ++-
 app/assets/javascripts/discourse/components/user-field.js.es6  | 3 ++-
 .../discourse/components/user-flag-percentage.js.es6           | 3 ++-
 app/assets/javascripts/discourse/components/user-info.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/user-link.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/user-stat.js.es6   | 3 ++-
 .../javascripts/discourse/components/user-stream-item.js.es6   | 3 ++-
 app/assets/javascripts/discourse/components/user-stream.js.es6 | 3 ++-
 .../discourse/components/user-summary-category-search.js.es6   | 3 ++-
 .../discourse/components/user-summary-section.js.es6           | 3 ++-
 .../javascripts/discourse/components/user-summary-topic.js.es6 | 3 ++-
 .../discourse/components/user-summary-topics-list.js.es6       | 3 ++-
 .../javascripts/discourse/components/user-summary-user.js.es6  | 3 ++-
 app/assets/javascripts/discourse/components/watch-read.js.es6  | 3 ++-
 .../discourse/templates/components/reviewable-score.js.es6     | 3 ++-
 .../select-kit/components/multi-select/selected-name.js.es6    | 3 ++-
 .../javascripts/select-kit/components/pinned-button.js.es6     | 3 ++-
 app/assets/javascripts/select-kit/components/select-kit.js.es6 | 3 ++-
 .../components/select-kit/select-kit-collection.js.es6         | 3 ++-
 .../select-kit/components/select-kit/select-kit-filter.js.es6  | 3 ++-
 .../select-kit/components/select-kit/select-kit-header.js.es6  | 3 ++-
 .../select-kit/components/select-kit/select-kit-row.js.es6     | 3 ++-
 .../select-kit/components/topic-notifications-button.js.es6    | 3 ++-
 .../javascripts/wizard/components/invite-list-user.js.es6      | 3 ++-
 app/assets/javascripts/wizard/components/invite-list.js.es6    | 3 ++-
 app/assets/javascripts/wizard/components/popular-themes.js.es6 | 3 ++-
 app/assets/javascripts/wizard/components/radio-button.js.es6   | 3 ++-
 app/assets/javascripts/wizard/components/staff-count.js.es6    | 3 ++-
 app/assets/javascripts/wizard/components/theme-previews.js.es6 | 3 ++-
 app/assets/javascripts/wizard/components/wizard-canvas.js.es6  | 3 ++-
 .../javascripts/wizard/components/wizard-field-dropdown.js.es6 | 3 ++-
 .../javascripts/wizard/components/wizard-field-image.js.es6    | 3 ++-
 .../javascripts/wizard/components/wizard-field-radio.js.es6    | 3 ++-
 .../javascripts/wizard/components/wizard-field-textarea.js.es6 | 3 ++-
 app/assets/javascripts/wizard/components/wizard-field.js.es6   | 3 ++-
 .../javascripts/wizard/components/wizard-image-preview.js.es6  | 3 ++-
 .../javascripts/wizard/components/wizard-step-form.js.es6      | 3 ++-
 app/assets/javascripts/wizard/components/wizard-step.js.es6    | 3 ++-
 app/assets/javascripts/wizard/lib/preview.js.es6               | 3 ++-
 .../components/discourse-local-dates-create-form.js.es6        | 3 ++-
 .../discourse/components/composer-presence-display.js.es6      | 3 ++-
 .../discourse/components/topic-presence-display.js.es6         | 3 ++-
 270 files changed, 540 insertions(+), 270 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index 887b99d368..f7aca533e3 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import loadScript from "discourse/lib/load-script";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   mode: "css",
   classNames: ["ace-wrapper"],
   _editor: null,
diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
index 5112564eec..67bc308948 100644
--- a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { renderSpinner } from "discourse/helpers/loading-spinner";
 import { escapeExpression } from "discourse/lib/utilities";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import { observes, on } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classNames: ["admin-backups-logs"],
 
diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6 b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
index f2480802b8..f110293a74 100644
--- a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
+++ b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "th",
     classNames: ["sortable"],
diff --git a/app/assets/javascripts/admin/components/admin-editable-field.js.es6 b/app/assets/javascripts/admin/components/admin-editable-field.js.es6
index 9d91e2a27f..f2785cffd4 100644
--- a/app/assets/javascripts/admin/components/admin-editable-field.js.es6
+++ b/app/assets/javascripts/admin/components/admin-editable-field.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "",
 
   buffer: "",
diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js.es6
index 5159168c30..b5f78c2a21 100644
--- a/app/assets/javascripts/admin/components/admin-form-row.js.es6
+++ b/app/assets/javascripts/admin/components/admin-form-row.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["row"]
 });
diff --git a/app/assets/javascripts/admin/components/admin-graph.js.es6 b/app/assets/javascripts/admin/components/admin-graph.js.es6
index 5949d51e24..be2e0f4e1a 100644
--- a/app/assets/javascripts/admin/components/admin-graph.js.es6
+++ b/app/assets/javascripts/admin/components/admin-graph.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import loadScript from "discourse/lib/load-script";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "canvas",
   type: "line",
 
diff --git a/app/assets/javascripts/admin/components/admin-nav.js.es6 b/app/assets/javascripts/admin/components/admin-nav.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/admin/components/admin-nav.js.es6
+++ b/app/assets/javascripts/admin/components/admin-nav.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
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 80d35c4693..6ad48208b4 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["admin-report-chart"],
   limit: 8,
   total: 0,
diff --git a/app/assets/javascripts/admin/components/admin-report-counters.js.es6 b/app/assets/javascripts/admin/components/admin-report-counters.js.es6
index d64bbe20fc..a66a3804c2 100644
--- a/app/assets/javascripts/admin/components/admin-report-counters.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-counters.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["admin-report-counters"],
 
   attributeBindings: ["model.description:title"]
diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
index 849d81460a..fc0127ec88 100644
--- a/app/assets/javascripts/admin/components/admin-report-counts.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   allTime: true,
   tagName: "tr",
   reverseColors: Ember.computed.match(
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.es6
index 7e4933381c..38b3d4595e 100644
--- a/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["admin-report-inline-table"]
 });
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.es6
index b7620b66cd..b644dbab9f 100644
--- 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.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "tr"
 });
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 852bc92b3d..1d70da8fed 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,7 +1,8 @@
+import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["admin-report-chart", "admin-report-stacked-chart"],
 
   init() {
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.es6
index c4bf831f56..51142a6d19 100644
--- a/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["admin-report-storage-stats"],
 
   backupLocation: setting("backup_location"),
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.es6
index 7140b69668..c2354de73a 100644
--- a/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "td",
   classNames: ["admin-report-table-cell"],
   classNameBindings: ["type", "property"],
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.es6
index ab986f2946..9317ef1f66 100644
--- a/app/assets/javascripts/admin/components/admin-report-table-header.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table-header.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "th",
   classNames: ["admin-report-table-header"],
   classNameBindings: ["label.mainProperty", "label.type", "isCurrentSort"],
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.es6
index 3be140c308..c86f586a08 100644
--- a/app/assets/javascripts/admin/components/admin-report-table-row.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table-row.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "tr",
   classNames: ["admin-report-table-row"],
   options: null
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js.es6
index 6e1e22c172..8df3a96f38 100644
--- a/app/assets/javascripts/admin/components/admin-report-table.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 const PAGES_LIMIT = 8;
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: ["sortable", "twoColumns"],
   classNames: ["admin-report-table"],
   sortable: false,
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.es6
index b7620b66cd..b644dbab9f 100644
--- 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.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "tr"
 });
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 37a8f2acc8..28e30b8a24 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -34,7 +35,7 @@ function collapseWeekly(data, average) {
   return aggregate;
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: ["isEnabled", "isLoading", "dasherizedDataSourceName"],
   classNames: ["admin-report"],
   isEnabled: true,
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
index e54cb32c60..8120456821 100644
--- a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
+++ b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("theme.targets", "onlyOverridden", "showAdvanced")
   visibleTargets(targets, onlyOverridden, showAdvanced) {
     return targets.filter(target => {
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.es6
index 1bf6128f1c..7b6cef4527 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import UserField from "admin/models/user-field";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -9,7 +10,7 @@ import {
   on
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend(bufferedProperty("userField"), {
+export default Component.extend(bufferedProperty("userField"), {
   editing: Ember.computed.empty("userField.id"),
   classNameBindings: [":user-field"],
 
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
index 4da1828021..8a408cf166 100644
--- a/app/assets/javascripts/admin/components/admin-watched-word.js.es6
+++ b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classNames: ["watched-word"],
 
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.es6
index 7a6b5c13f1..32ca7e4fad 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["hook-event"],
   typeName: Ember.computed.alias("type.name"),
 
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.es6
index b558baa0b4..693e6502ff 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "li",
   expandDetails: null,
   expandDetailsRequestKey: "request",
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.es6
index 6e325b2fe9..0d8e80cc81 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classes: ["text-muted", "text-danger", "text-successful", "text-muted"],
     icons: ["far-circle", "times-circle", "circle", "circle"],
diff --git a/app/assets/javascripts/admin/components/admin-wrapper.js.es6 b/app/assets/javascripts/admin/components/admin-wrapper.js.es6
index 45daf32977..b60ac12855 100644
--- a/app/assets/javascripts/admin/components/admin-wrapper.js.es6
+++ b/app/assets/javascripts/admin/components/admin-wrapper.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     $("body").addClass("admin-interface");
diff --git a/app/assets/javascripts/admin/components/cancel-link.js.es6 b/app/assets/javascripts/admin/components/cancel-link.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/admin/components/cancel-link.js.es6
+++ b/app/assets/javascripts/admin/components/cancel-link.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 17783cd36a..f6f0025354 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { default as loadScript, loadCSS } from "discourse/lib/load-script";
 
 /**
@@ -7,7 +8,7 @@ import { default as loadScript, loadCSS } from "discourse/lib/load-script";
   @param brightnessValue is a number from 0 to 255 representing the brightness of the color. See ColorSchemeColor.
   @params valid is a boolean indicating if the input field is a valid color.
 **/
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["color-picker"],
   hexValueChanged: function() {
     var hex = this.hexValue;
diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js.es6 b/app/assets/javascripts/admin/components/email-styles-editor.js.es6
index d0e569421f..75811ec41c 100644
--- a/app/assets/javascripts/admin/components/email-styles-editor.js.es6
+++ b/app/assets/javascripts/admin/components/email-styles-editor.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   editorId: Ember.computed.reads("fieldName"),
 
   @computed("fieldName", "styles.html", "styles.css")
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index 7639312ceb..746bfeede3 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Component.extend(bufferedProperty("host"), {
+export default Component.extend(bufferedProperty("host"), {
   editToggled: false,
   tagName: "tr",
   categoryId: null,
diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js.es6
index 4791e84e35..da7f9abb7f 100644
--- a/app/assets/javascripts/admin/components/embedding-setting.js.es6
+++ b/app/assets/javascripts/admin/components/embedding-setting.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["embed-setting"],
 
   @computed("field")
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
index ae6094c6a7..a6156a93ad 100644
--- a/app/assets/javascripts/admin/components/flag-user-lists.js.es6
+++ b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["flag-user-lists"]
 });
diff --git a/app/assets/javascripts/admin/components/highlighted-code.js.es6 b/app/assets/javascripts/admin/components/highlighted-code.js.es6
index 9f99c0929b..d182d7e2a1 100644
--- a/app/assets/javascripts/admin/components/highlighted-code.js.es6
+++ b/app/assets/javascripts/admin/components/highlighted-code.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @on("didInsertElement")
   @observes("code")
   _refresh: function() {
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6 b/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
index a31b436167..e88c2bc3b7 100644
--- a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
+++ b/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["inline-edit"],
 
   checked: null,
diff --git a/app/assets/javascripts/admin/components/install-theme-item.js.es6 b/app/assets/javascripts/admin/components/install-theme-item.js.es6
index c1f3f57a8c..040760db01 100644
--- a/app/assets/javascripts/admin/components/install-theme-item.js.es6
+++ b/app/assets/javascripts/admin/components/install-theme-item.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["install-theme-item"]
 });
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index d4bf91ec6a..c1938dc2d9 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
 import copyText from "discourse/lib/copy-text";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["ip-lookup"],
 
   @computed("other_accounts.length", "totalOthersWithSameIP")
diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js.es6 b/app/assets/javascripts/admin/components/moderation-history-item.js.es6
index b7620b66cd..b644dbab9f 100644
--- a/app/assets/javascripts/admin/components/moderation-history-item.js.es6
+++ b/app/assets/javascripts/admin/components/moderation-history-item.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "tr"
 });
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index e60393b3ba..dcb3bd3ba5 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 const ACTIONS = ["delete", "delete_replies", "edit", "none"];
 
-export default Ember.Component.extend({
+export default Component.extend({
   postId: null,
   postAction: null,
   postEdit: null,
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 40ae69d090..74efe085d9 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 import Permalink from "admin/models/permalink";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["permalink-form"],
   formSubmitted: false,
   permalinkType: "topic_id",
diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js.es6 b/app/assets/javascripts/admin/components/report-filters/filter.js.es6
index 25f2464f95..f61b2d496a 100644
--- a/app/assets/javascripts/admin/components/report-filters/filter.js.es6
+++ b/app/assets/javascripts/admin/components/report-filters/filter.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   actions: {
     onChange(value) {
       this.applyFilter(this.get("filter.id"), value);
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index b9cab23040..8f6a291325 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import {
@@ -17,7 +18,7 @@ import {
         uploadText="UPLOAD"
     }}
 **/
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "button",
     classNames: ["btn", "ru"],
diff --git a/app/assets/javascripts/admin/components/save-controls.js.es6 b/app/assets/javascripts/admin/components/save-controls.js.es6
index cade010e5b..cc858b1530 100644
--- a/app/assets/javascripts/admin/components/save-controls.js.es6
+++ b/app/assets/javascripts/admin/components/save-controls.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["controls"],
 
   buttonDisabled: Ember.computed.or("model.isSaving", "saveDisabled"),
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.es6
index 7fb246bf7a..1b20d7f39c 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 /**
   A form to create an IP address that will be blocked or whitelisted.
   Example usage:
@@ -13,7 +14,7 @@ import ScreenedIpAddress from "admin/models/screened-ip-address";
 import computed from "ember-addons/ember-computed-decorators";
 import { on } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["screened-ip-address-form"],
   formSubmitted: false,
   actionName: "block",
diff --git a/app/assets/javascripts/admin/components/secret-value-list.js.es6 b/app/assets/javascripts/admin/components/secret-value-list.js.es6
index 58539cb916..db384bd5c6 100644
--- a/app/assets/javascripts/admin/components/secret-value-list.js.es6
+++ b/app/assets/javascripts/admin/components/secret-value-list.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":value-list", ":secret-value-list"],
   inputDelimiter: null,
   collection: null,
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/admin/components/silence-details.js.es6
+++ b/app/assets/javascripts/admin/components/silence-details.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index e94713f476..227d7e9908 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SiteSetting from "admin/models/site-setting";
 import SettingComponent from "admin/mixins/setting-component";
 import showModal from "discourse/lib/show-modal";
 import AboutRoute from "discourse/routes/about";
 
-export default Ember.Component.extend(BufferedContent, SettingComponent, {
+export default Component.extend(BufferedContent, SettingComponent, {
   _save(callback) {
     const defaultCategoriesSettings = [
       "default_categories_watching",
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
index f46e965832..5bfc0612af 100644
--- a/app/assets/javascripts/admin/components/site-settings/bool.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("value")
   enabled: {
     get(value) {
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.es6
index 36c712fa8d..d4476ddf13 100644
--- a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/category-list.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("value")
   selectedCategories: {
     get(value) {
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.es6
index 0ab60a3436..21af030269 100644
--- a/app/assets/javascripts/admin/components/site-settings/group-list.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/group-list.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed()
   groupChoices() {
     return this.site.get("groups").map(g => {
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.es6
index 57bd7fa49b..7e705321d0 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Component.extend({
+export default Component.extend({
   actions: {
     showUploadModal({ value, setting }) {
       showModal("admin-uploaded-image-list", {
diff --git a/app/assets/javascripts/admin/components/site-text-summary.js.es6 b/app/assets/javascripts/admin/components/site-text-summary.js.es6
index da6dda43f8..4467a092d1 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js.es6
+++ b/app/assets/javascripts/admin/components/site-text-summary.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["site-text"],
   classNameBindings: ["siteText.overridden"],
 
diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js.es6
index 5c7da1dc9d..1c295799dd 100644
--- a/app/assets/javascripts/admin/components/staff-actions.js.es6
+++ b/app/assets/javascripts/admin/components/staff-actions.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["table", "staff-actions"],
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/admin/components/suspension-details.js.es6
+++ b/app/assets/javascripts/admin/components/suspension-details.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js.es6
index 1373792f24..1682fd955e 100644
--- a/app/assets/javascripts/admin/components/tags-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/tags-uploader.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   type: "csv",
   uploadUrl: "/tags/upload",
   addDisabled: Ember.computed.alias("uploading"),
diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6 b/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
index 5a764e55eb..292356d55a 100644
--- a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
+++ b/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SettingComponent from "admin/mixins/setting-component";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Component.extend(BufferedContent, SettingComponent, {
+export default Component.extend(BufferedContent, SettingComponent, {
   layoutName: "admin/templates/components/site-setting",
   _save() {
     return ajax(`/admin/themes/${this.model.id}/setting`, {
diff --git a/app/assets/javascripts/admin/components/theme-translation.js.es6 b/app/assets/javascripts/admin/components/theme-translation.js.es6
index ab29ac2312..dcdc4a5fd2 100644
--- a/app/assets/javascripts/admin/components/theme-translation.js.es6
+++ b/app/assets/javascripts/admin/components/theme-translation.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SettingComponent from "admin/mixins/setting-component";
 
-export default Ember.Component.extend(BufferedContent, SettingComponent, {
+export default Component.extend(BufferedContent, SettingComponent, {
   layoutName: "admin/templates/components/site-setting",
   setting: Ember.computed.alias("translation"),
   type: "string",
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 7bafa95c21..62e5dff884 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -7,7 +8,7 @@ import { escape } from "pretty-text/sanitizer";
 
 const MAX_COMPONENTS = 4;
 
-export default Ember.Component.extend({
+export default Component.extend({
   childrenExpanded: false,
   classNames: ["themes-list-item"],
   classNameBindings: ["theme.selected:selected"],
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js.es6
index d306bab11c..ec66ce5c4f 100644
--- a/app/assets/javascripts/admin/components/themes-list.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { THEMES, COMPONENTS } from "admin/models/theme";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   THEMES: THEMES,
   COMPONENTS: COMPONENTS,
 
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6
index ff93375260..8a1fa5baa1 100644
--- a/app/assets/javascripts/admin/components/value-list.js.es6
+++ b/app/assets/javascripts/admin/components/value-list.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":value-list"],
 
   inputInvalid: Ember.computed.empty("newValue"),
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index b56f2c423c..919f6de9ef 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import WatchedWord from "admin/models/watched-word";
 import {
   default as computed,
@@ -5,7 +6,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["watched-word-form"],
   formSubmitted: false,
   actionKey: null,
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
index b1706337f2..b38d8c2606 100644
--- a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   type: "txt",
   classNames: "watched-words-uploader",
   uploadUrl: "/admin/logs/watched_words/upload",
diff --git a/app/assets/javascripts/discourse/components/about-page-users.js.es6 b/app/assets/javascripts/discourse/components/about-page-users.js.es6
index e2d65135db..7d4ff773ba 100644
--- a/app/assets/javascripts/discourse/components/about-page-users.js.es6
+++ b/app/assets/javascripts/discourse/components/about-page-users.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import { userPath } from "discourse/lib/url";
 import { formatUsername, escapeExpression } from "discourse/lib/utilities";
 import { normalize } from "discourse/components/user-info";
 import { renderAvatar } from "discourse/helpers/user-avatar";
 
-export default Ember.Component.extend({
+export default Component.extend({
   usersTemplates: Ember.computed("users.[]", function() {
     return (this.users || []).map(user => {
       let name = "";
diff --git a/app/assets/javascripts/discourse/components/activation-controls.js.es6 b/app/assets/javascripts/discourse/components/activation-controls.js.es6
index d7d7fe800f..9b49ce7211 100644
--- a/app/assets/javascripts/discourse/components/activation-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/activation-controls.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: "activation-controls"
 });
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.es6
index d5399dcfe7..209367e829 100644
--- a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
+++ b/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   _slug: null,
 
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
index 7349ce5a6b..3350ddff31 100644
--- a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   type: "avatar",
   tagName: "span",
   imageIsNotASquare: false,
diff --git a/app/assets/javascripts/discourse/components/backup-codes.js.es6 b/app/assets/javascripts/discourse/components/backup-codes.js.es6
index 51be5edccd..5e80cc3e3b 100644
--- a/app/assets/javascripts/discourse/components/backup-codes.js.es6
+++ b/app/assets/javascripts/discourse/components/backup-codes.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 // https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding
@@ -12,7 +13,7 @@ function b64EncodeUnicode(str) {
   );
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["backup-codes"],
   backupCodes: null,
 
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
index 1fe3565aa3..1e8a7059d6 100644
--- a/app/assets/javascripts/discourse/components/backup-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   tagName: "span",
 
   @computed("uploading", "uploadProgress")
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index d0c2708b66..1861788a02 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "span",
   classNameBindings: [
     ":user-badge",
diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js.es6
index c4312447e9..f9380b11eb 100644
--- a/app/assets/javascripts/discourse/components/badge-card.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-card.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { sanitize, emojiUnescape } from "discourse/lib/text";
 
-export default Ember.Component.extend({
+export default Component.extend({
   size: "medium",
   classNameBindings: [":badge-card", "size", "badge.slug"],
 
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js.es6
index 53ed8e385a..94c08c95ca 100644
--- a/app/assets/javascripts/discourse/components/badge-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-selector.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   on,
   observes,
@@ -6,7 +7,7 @@ import {
 import { findRawTemplate } from "discourse/lib/raw-templates";
 const { makeArray } = Ember;
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("placeholderKey")
   placeholder(placeholderKey) {
     return placeholderKey ? I18n.t(placeholderKey) : "";
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js.es6
index 10a7088bd1..41b82f73e7 100644
--- a/app/assets/javascripts/discourse/components/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-title.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["badge-title"],
 
   saved: false,
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index e8af6acc94..f4bc6eb49c 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   loadingMore: Ember.computed.alias("topicList.loadingMore"),
   loading: Ember.computed.not("loaded"),
 
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index cd8157c828..21992f108b 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 //  A breadcrumb including category drop downs
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: ["hidden:hidden", ":category-breadcrumb"],
   tagName: "ol",
 
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
index 04d125b803..1070402ca0 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["bulk-select-container"],
 
   actions: {
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.es6
index 8da2cf8495..4f2b2c2497 100644
--- a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["categories-and-latest"]
 });
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.es6
index 4f1c888692..7d9caf45c2 100644
--- a/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["categories-and-top"]
 });
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
index c061cb55e9..b5536923ec 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "li",
 
   @computed("topic.pinned", "topic.closed", "topic.archived")
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.es6
index ed9e4a87a7..b3144aeba0 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "section",
   classNameBindings: [
     ":category-boxes-with-topics",
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
index f78bfbfcd7..aa7992b444 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "section",
   classNameBindings: [
     ":category-boxes",
diff --git a/app/assets/javascripts/discourse/components/categories-only.js.es6 b/app/assets/javascripts/discourse/components/categories-only.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/discourse/components/categories-only.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-only.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js.es6 b/app/assets/javascripts/discourse/components/categories-topic-list.js.es6
index 9b102dc46c..ccc903e96e 100644
--- a/app/assets/javascripts/discourse/components/categories-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-topic-list.js.es6
@@ -1,2 +1,3 @@
+import Component from "@ember/component";
 // Exists so plugins can use it
-export default Ember.Component.extend();
+export default Component.extend();
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js.es6 b/app/assets/javascripts/discourse/components/category-title-before.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/discourse/components/category-title-before.js.es6
+++ b/app/assets/javascripts/discourse/components/category-title-before.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js.es6 b/app/assets/javascripts/discourse/components/category-title-link.js.es6
index 4a6fa5d604..c6dacce317 100644
--- a/app/assets/javascripts/discourse/components/category-title-link.js.es6
+++ b/app/assets/javascripts/discourse/components/category-title-link.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "h3"
 });
diff --git a/app/assets/javascripts/discourse/components/category-unread.js.es6 b/app/assets/javascripts/discourse/components/category-unread.js.es6
index 1d3bdc0353..5bf9ae8df8 100644
--- a/app/assets/javascripts/discourse/components/category-unread.js.es6
+++ b/app/assets/javascripts/discourse/components/category-unread.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "span"
 });
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js.es6
index f10b1d9e1e..5b261e5640 100644
--- a/app/assets/javascripts/discourse/components/cdn-img.js.es6
+++ b/app/assets/javascripts/discourse/components/cdn-img.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed("src")
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index 581cc361d5..b4518c2c4f 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   loading: null,
   noResults: null,
   messages: null,
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index 4ee45b5eee..df0d3b1c47 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   loading: null,
   noResults: null,
   topics: null,
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
index 8ea284b8f3..a1933193d2 100644
--- a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "button",
   attributeBindings: ["style", "title"],
   classNameBindings: [":colorpicker", "isUsed:used-color:unused-color"],
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js.es6
index 8fc84886c7..c50fe34d6c 100644
--- a/app/assets/javascripts/discourse/components/color-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: "colors-container",
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
index c4e014c5f7..6b86bb39c6 100644
--- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import {
   PRIVATE_MESSAGE,
@@ -16,7 +17,7 @@ const TITLES = {
   [EDIT_SHARED_DRAFT]: "composer.edit_shared_draft"
 };
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["composer-action-title"],
   options: Ember.computed.alias("model.replyOptions"),
   action: Ember.computed.alias("model.action"),
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index 301e22452f..7fea43389d 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -20,7 +21,7 @@ function mouseYPos(e) {
   return e.clientY || (e.touches && e.touches[0] && e.touches[0].clientY);
 }
 
-export default Ember.Component.extend(KeyEnterEscape, {
+export default Component.extend(KeyEnterEscape, {
   elementId: "reply-control",
 
   classNameBindings: [
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index c48098bce9..0709dc9c5f 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import {
   default as computed,
@@ -53,7 +54,7 @@ export function addComposerUploadHandler(extensions, method) {
   });
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: ["showToolbar:toolbar-visible", ":wmd-controls"],
 
   uploadProgress: 0,
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js.es6
index 4cdda3fc49..6cb98b8018 100644
--- a/app/assets/javascripts/discourse/components/composer-message.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-message.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":composer-popup", ":hidden", "message.extraClass"],
 
   @computed("message.templateName")
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 6a01d33950..659839bf65 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import LinkLookup from "discourse/lib/link-lookup";
 
 let _messagesCache = {};
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":composer-popup-container", "hidden"],
   checkedMessages: false,
   messages: null,
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 5302ab85f4..afc9a8ca65 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -7,7 +8,7 @@ import { load, lookupCache } from "pretty-text/oneboxer";
 import { ajax } from "discourse/lib/ajax";
 import afterTransition from "discourse/lib/after-transition";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["title-input"],
   watchForLink: Ember.computed.alias("composer.canEditTopicFeaturedLink"),
 
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
index f618e1ca61..9f0547d641 100644
--- a/app/assets/javascripts/discourse/components/composer-toggles.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed("composeState")
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
index 04a1ba7dc5..694db1cfd3 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   showSelector: true,
   shouldHide: false,
   defaultUsernameCount: 0,
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
index dd8f321635..fb6f310518 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["conditional-loading-section"],
 
   classNameBindings: ["isLoading"],
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
index e0353315fe..1c6e37ec03 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [
     ":loading-container",
     "containerClass",
diff --git a/app/assets/javascripts/discourse/components/connector-container.js.es6 b/app/assets/javascripts/discourse/components/connector-container.js.es6
index 905ec1058e..6c29674578 100644
--- a/app/assets/javascripts/discourse/components/connector-container.js.es6
+++ b/app/assets/javascripts/discourse/components/connector-container.js.es6
@@ -1 +1,2 @@
-export default Ember.Component.extend();
+import Component from "@ember/component";
+export default Component.extend();
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index 3e345df054..e9e19b338f 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { cookAsync } from "discourse/lib/text";
 import { ajax } from "discourse/lib/ajax";
 
-const CookText = Ember.Component.extend({
+const CookText = Component.extend({
   tagName: "",
   cooked: null,
 
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js.es6
index 5ee48fb5ab..9bdb715dc5 100644
--- a/app/assets/javascripts/discourse/components/count-i18n.js.es6
+++ b/app/assets/javascripts/discourse/components/count-i18n.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "span",
     rerenderTriggers: ["count", "suffix"],
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js.es6
index 9d91b58b35..e382244dc9 100644
--- a/app/assets/javascripts/discourse/components/create-account.js.es6
+++ b/app/assets/javascripts/discourse/components/create-account.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["create-account"],
 
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
index a03702e98e..b2ab306a12 100644
--- a/app/assets/javascripts/discourse/components/create-topic-button.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "",
   label: "topic.create"
 });
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
index 1e7658cfd5..a5a20ac69a 100644
--- a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { observes } from "ember-addons/ember-computed-decorators";
 import LivePostCounts from "discourse/models/live-post-counts";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: ["hidden:hidden", ":create-topics-notice"],
 
   enabled: false,
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index 8178fdc09e..7bd621d8ed 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   type: "csv",
   tagName: "span",
   uploadUrl: "/invites/upload_csv",
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js.es6
index b30649deb5..8dd3414e23 100644
--- a/app/assets/javascripts/discourse/components/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/components/custom-html.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { getCustomHTML } from "discourse/helpers/custom-html";
 import { getOwner } from "discourse-common/lib/get-owner";
 
-export default Ember.Component.extend({
+export default Component.extend({
   triggerAppEvent: null,
 
   init() {
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index 950ddcff30..b8ca7343cd 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
 
-export default Ember.Component.extend({
+export default Component.extend({
   // subclasses need this
   layoutName: "components/d-button",
 
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index dc2e9fe00a..1657552555 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 /*global Mousetrap:true */
 import {
   default as computed,
@@ -211,7 +212,7 @@ export function onToolbarCreate(func) {
   addToolbarCallback(func);
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["d-editor"],
   ready: false,
   lastSel: null,
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 8e8f01b0bc..33b444d05b 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["modal-body"],
   fixed: false,
   dismissable: true,
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6 b/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js.es6
index 26870bcd02..f7358ec15b 100644
--- a/app/assets/javascripts/discourse/components/d-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/d-navigation.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   router: Ember.inject.service(),
   persistedQueryParams: null,
 
diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js.es6
index 1f1d07a676..ef1da4b0a0 100644
--- a/app/assets/javascripts/discourse/components/d-section.js.es6
+++ b/app/assets/javascripts/discourse/components/d-section.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
 // Can add a body class from within a component, also will scroll to the top automatically.
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "section",
 
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js.es6
index d29962c02c..0161fb8aa2 100644
--- a/app/assets/javascripts/discourse/components/date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/date-input.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
 import {
@@ -5,7 +6,7 @@ import {
   on
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["d-date-input"],
   date: null,
   _picker: null,
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index 2c7d073169..7fc28a50ef 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
 import {
@@ -7,7 +8,7 @@ import {
 
 const DATE_FORMAT = "YYYY-MM-DD";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["date-picker-wrapper"],
   _picker: null,
   value: null,
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.es6
index 3754be93cd..b86b2a3a12 100644
--- a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6
+++ b/app/assets/javascripts/discourse/components/date-time-input-range.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["d-date-time-input-range"],
 
   from: null,
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js.es6 b/app/assets/javascripts/discourse/components/date-time-input.js.es6
index ce173e3d42..41b41a8d32 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js.es6
+++ b/app/assets/javascripts/discourse/components/date-time-input.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["d-date-time-input"],
   date: null,
   showTime: true,
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
index 612d9d9f89..0df39dce25 100644
--- a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
+++ b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import KeyValueStore from "discourse/lib/key-value-store";
 import {
@@ -14,7 +15,7 @@ import {
 
 const keyValueStore = new KeyValueStore(context);
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["controls"],
 
   @computed("isNotSupported")
diff --git a/app/assets/javascripts/discourse/components/directory-item.js.es6 b/app/assets/javascripts/discourse/components/directory-item.js.es6
index 79902869c8..05c085c2e9 100644
--- a/app/assets/javascripts/discourse/components/directory-item.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-item.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "tr",
   classNameBindings: ["me"],
   me: propertyEqual("item.user.id", "currentUser.id")
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index 6765568078..d45e9ce9e7 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "th",
     classNames: ["sortable"],
diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js.es6 b/app/assets/javascripts/discourse/components/disabled-icon.js.es6
index e54647c155..433c5f4d72 100644
--- a/app/assets/javascripts/discourse/components/disabled-icon.js.es6
+++ b/app/assets/javascripts/discourse/components/disabled-icon.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "span",
   classNameBindings: [":fa-stack"]
 });
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
index 6a84f538ca..6c8b18ea1e 100644
--- a/app/assets/javascripts/discourse/components/discourse-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("user.dismissed_banner_key", "banner.key", "hide")
   visible(dismissedBannerKey, bannerKey, hide) {
     dismissedBannerKey =
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
index 17398e4a21..fe4e7fd9c8 100644
--- a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "span",
 
   @computed("text")
diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
index 9f151dc1fe..ea07e0d5fe 100644
--- a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "a",
   classNameBindings: [":discourse-tag", "style", "tagClass"],
   attributeBindings: ["href"],
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 7e3011fb6e..53ab8edbbe 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import AddArchetypeClass from "discourse/mixins/add-archetype-class";
 import ClickTrack from "discourse/lib/click-track";
@@ -14,7 +15,7 @@ function highlight(postNumber) {
   $contents.on("animationend", () => $contents.removeClass("highlighted"));
 }
 
-export default Ember.Component.extend(
+export default Component.extend(
   AddArchetypeClass,
   Scrolling,
   MobileScrollDirection,
diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js.es6
index 97bbc33009..d5c70bbf9a 100644
--- a/app/assets/javascripts/discourse/components/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-categories.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import UrlRefresh from "discourse/mixins/url-refresh";
 import { on } from "ember-addons/ember-computed-decorators";
 
 const CATEGORIES_LIST_BODY_CLASS = "categories-list";
 
-export default Ember.Component.extend(UrlRefresh, {
+export default Component.extend(UrlRefresh, {
   classNames: ["contents"],
 
   @on("didInsertElement")
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 3a5f30e4f5..5f92bc7fb8 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
 import UrlRefresh from "discourse/mixins/url-refresh";
 
-const DiscoveryTopicsListComponent = Ember.Component.extend(
+const DiscoveryTopicsListComponent = Component.extend(
   UrlRefresh,
   LoadMore,
   {
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
index 6a45839cf7..bd2fe0661f 100644
--- a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
@@ -1,4 +1,5 @@
-const EditCategoryPanel = Ember.Component.extend({});
+import Component from "@ember/component";
+const EditCategoryPanel = Component.extend({});
 
 export default EditCategoryPanel;
 
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 5f2f6b4912..15aae0ed28 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "li",
   classNameBindings: ["active", "tabClassName"],
 
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.es6
index 1f65b8797d..5d01c739e7 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes,
@@ -13,7 +14,7 @@ import {
   BUMP_TYPE
 } from "discourse/controllers/edit-topic-timer";
 
-export default Ember.Component.extend({
+export default Component.extend({
   selection: Ember.computed.alias("topicTimer.status_type"),
   autoOpen: Ember.computed.equal("selection", OPEN_STATUS_TYPE),
   autoClose: Ember.computed.equal("selection", CLOSE_STATUS_TYPE),
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index dfe6287c67..614db00529 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 import { emojiUrlFor } from "discourse/lib/text";
@@ -15,7 +16,7 @@ const customEmojis = _.keys(extendedEmojiList()).map(code => {
   return { code, src: emojiUrlFor(code) };
 });
 
-export default Ember.Component.extend({
+export default Component.extend({
   automaticPositioning: true,
   emojiStore: Ember.inject.service("emoji-store"),
 
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
index f3273d8322..d118b904c5 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   type: "emoji",
   uploadUrl: "/admin/customize/emojis",
   hasName: Ember.computed.notEmpty("name"),
diff --git a/app/assets/javascripts/discourse/components/expand-post.js.es6 b/app/assets/javascripts/discourse/components/expand-post.js.es6
index 4bd2b8d4a5..1302e76795 100644
--- a/app/assets/javascripts/discourse/components/expand-post.js.es6
+++ b/app/assets/javascripts/discourse/components/expand-post.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
   expanded: null,
   _loading: false,
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js.es6 b/app/assets/javascripts/discourse/components/featured-topic.js.es6
index eb0bde08ad..a975b893e9 100644
--- a/app/assets/javascripts/discourse/components/featured-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/featured-topic.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNameBindings: [":featured-topic"],
 
   click(e) {
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 6a7a713d4e..3434ec2954 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["flag-action-type"],
 
   @computed("flag.name_key")
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js.es6
index 8499713ce2..f039b30660 100644
--- a/app/assets/javascripts/discourse/components/flag-selection.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-selection.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
 // Mostly hacks because `flag.hbs` didn't use `radio-button`
-export default Ember.Component.extend({
+export default Component.extend({
   _selectRadio() {
     this.element.querySelector("input[type='radio']").checked = false;
 
diff --git a/app/assets/javascripts/discourse/components/flat-button.js.es6 b/app/assets/javascripts/discourse/components/flat-button.js.es6
index bcac9cc01f..1348836907 100644
--- a/app/assets/javascripts/discourse/components/flat-button.js.es6
+++ b/app/assets/javascripts/discourse/components/flat-button.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "button",
   classNames: ["btn-flat"],
   attributeBindings: ["disabled", "translatedTitle:title"],
diff --git a/app/assets/javascripts/discourse/components/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js.es6
index 22263eca31..e829a884c5 100644
--- a/app/assets/javascripts/discourse/components/footer-message.js.es6
+++ b/app/assets/javascripts/discourse/components/footer-message.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["footer-message"]
 });
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
index 9386c1b3f7..903f0886f0 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -5,7 +6,7 @@ import {
 import { FORMAT } from "select-kit/components/future-date-input-selector";
 import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
 
-export default Ember.Component.extend({
+export default Component.extend({
   selection: null,
   date: null,
   time: null,
diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6 b/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
index 74426a45b6..8b475cbbdb 100644
--- a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
+++ b/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     $(this.element.querySelector("input"))
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 3d8c46679b..5bacd98013 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import LogsNotice from "discourse/services/logs-notice";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     rerenderTriggers: ["site.isReadOnly", "siteSettings.disable_emails"],
 
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js.es6
index e99e862f8e..8ab1969b62 100644
--- a/app/assets/javascripts/discourse/components/google-search.js.es6
+++ b/app/assets/javascripts/discourse/components/google-search.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["google-search-form"],
   classNameBindings: ["hidden:hidden"],
 
diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6 b/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
index 145b770e51..790c675e49 100644
--- a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "li"
 });
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
index 2c3df56b1f..37e25cfb1c 100644
--- a/app/assets/javascripts/discourse/components/group-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { setting } from "discourse/lib/computed";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import CardContentsBase from "discourse/mixins/card-contents-base";
@@ -6,7 +7,7 @@ import { groupPath } from "discourse/lib/url";
 
 const maxMembersToDisplay = 10;
 
-export default Ember.Component.extend(CardContentsBase, CleansUp, {
+export default Component.extend(CardContentsBase, CleansUp, {
   elementId: "group-card",
   triggeringLinkClass: "mention-group",
   classNames: ["no-bg"],
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index f16d48827e..a80512b93d 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 import { convertIconClass } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["group-flair-inputs"],
 
   @computed
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
index 8a35118a89..247b7e1829 100644
--- a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "th",
     classNames: ["sortable"],
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.es6
index 0944c3ddf1..a6712bf498 100644
--- a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed("type")
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.es6
index b7765f9620..acba43f2b7 100644
--- a/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "",
   expandDetails: false,
 
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.es6
index 1487151fde..726bfede36 100644
--- a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   saving: null,
 
   @computed("saving")
diff --git a/app/assets/javascripts/discourse/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js.es6
index be68373fa7..1c511cab15 100644
--- a/app/assets/javascripts/discourse/components/group-member.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["item"],
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index 8ef63b5a50..00c0bb6201 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["group-members-input"],
   addButton: true,
 
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index 31ac171734..6b58c5370d 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["group-membership-button"],
 
   @computed("model.public_admission", "userIsGroupUser")
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js.es6 b/app/assets/javascripts/discourse/components/group-navigation.js.es6
index 91ad923ffc..89720fbbe8 100644
--- a/app/assets/javascripts/discourse/components/group-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/group-navigation.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js.es6
index f94f36dc8d..5a3a096f49 100644
--- a/app/assets/javascripts/discourse/components/group-post.js.es6
+++ b/app/assets/javascripts/discourse/components/group-post.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("post.url")
   postUrl: Discourse.getURL
 });
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6
index c70c51fbc7..3083207ff3 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/group-selector.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   on,
   observes,
@@ -5,7 +6,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("placeholderKey")
   placeholder(placeholderKey) {
     return placeholderKey ? I18n.t(placeholderKey) : "";
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.es6
index f4756978a6..e4d1e6bb79 100644
--- a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   init() {
     this._super(...arguments);
 
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.es6
index 7a9849463a..1115786b08 100644
--- a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   init() {
     this._super(...arguments);
 
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.es6
index 15c2efbd96..bca0af8297 100644
--- a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -6,7 +7,7 @@ import Group from "discourse/models/group";
 import InputValidation from "discourse/models/input-validation";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Component.extend({
+export default Component.extend({
   disableSave: null,
   nameInput: null,
 
diff --git a/app/assets/javascripts/discourse/components/groups-info.js.es6 b/app/assets/javascripts/discourse/components/groups-info.js.es6
index a95c9da337..cf439ef7d0 100644
--- a/app/assets/javascripts/discourse/components/groups-info.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-info.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "span",
   classNames: ["group-info-details"],
 
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
index e3951d5277..df632e2557 100644
--- a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
+++ b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     $(".d-modal.fixed-modal")
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js.es6
index 6e8be431dc..a98ffdb653 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js.es6
+++ b/app/assets/javascripts/discourse/components/highlight-text.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import highlightText from "discourse/lib/highlight-text";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "span",
 
   _highlightOnInsert: function() {
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.es6
index 5bf27c13a1..6f26b5700b 100644
--- a/app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "div",
   items: null,
   actions: {
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list.js.es6
index ac81cc505d..f73ac290e4 100644
--- a/app/assets/javascripts/discourse/components/ignored-user-list.js.es6
+++ b/app/assets/javascripts/discourse/components/ignored-user-list.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
 import User from "discourse/models/user";
 
-export default Ember.Component.extend({
+export default Component.extend({
   item: null,
   actions: {
     removeIgnoredUser(item) {
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index df9ce3e2b2..9142c17e60 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 import lightbox from "discourse/lib/lightbox";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   classNames: ["image-uploader"],
   loadingLightbox: false,
 
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js.es6
index 23b8fbe688..d3a9d6c3b7 100644
--- a/app/assets/javascripts/discourse/components/images-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/images-uploader.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Ember.Component.extend(UploadMixin, {
+export default Component.extend(UploadMixin, {
   type: "avatar",
   tagName: "span",
 
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index aceafa7458..1d77546403 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classNameBindings: [":tip", "good", "bad"],
     rerenderTriggers: ["validation"],
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index 432a0b7325..3f1dd39a0a 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import { emailValid } from "discourse/lib/utilities";
 import computed from "ember-addons/ember-computed-decorators";
 import Group from "discourse/models/group";
 import Invite from "discourse/models/invite";
 import { i18n } from "discourse/lib/computed";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: null,
 
   inviteModel: Ember.computed.alias("panel.model.inviteModel"),
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.es6
index 487ae8aa46..f0e3ee875c 100644
--- a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import {
   showEntrance,
   navigateToTopic
 } from "discourse/components/topic-list-item";
 
-export default Ember.Component.extend({
+export default Component.extend({
   attributeBindings: ["topic.id:data-topic-id"],
   classNameBindings: [
     ":latest-topic-list-item",
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js.es6
index 0afdbd304b..653761018e 100644
--- a/app/assets/javascripts/discourse/components/link-to-input.js.es6
+++ b/app/assets/javascripts/discourse/components/link-to-input.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   showInput: false,
 
   click() {
diff --git a/app/assets/javascripts/discourse/components/links-redirect.js.es6 b/app/assets/javascripts/discourse/components/links-redirect.js.es6
index 84d5f890f0..0ddd92b21b 100644
--- a/app/assets/javascripts/discourse/components/links-redirect.js.es6
+++ b/app/assets/javascripts/discourse/components/links-redirect.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import ClickTrack from "discourse/lib/click-track";
 
-export default Ember.Component.extend({
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6
index f81b33b764..8668fa5742 100644
--- a/app/assets/javascripts/discourse/components/load-more.js.es6
+++ b/app/assets/javascripts/discourse/components/load-more.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 
-export default Ember.Component.extend(LoadMore, {
+export default Component.extend(LoadMore, {
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
index 3279bda5cc..a5a0967411 100644
--- a/app/assets/javascripts/discourse/components/login-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { findAll } from "discourse/models/login-method";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   elementId: "login-buttons",
   classNameBindings: ["hidden"],
 
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
index 59939542cb..e8bbe98c87 100644
--- a/app/assets/javascripts/discourse/components/login-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6 b/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
index 4c47f0e126..fcd85640e6 100644
--- a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { showEntrance } from "discourse/components/topic-list-item";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "tr",
   classNameBindings: [
     ":category-topic-link",
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index 49392fc336..a60a107079 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @on("init")
   _init() {
     if (!this.get("site.mobileView")) {
diff --git a/app/assets/javascripts/discourse/components/modal-panel.js.es6 b/app/assets/javascripts/discourse/components/modal-panel.js.es6
index b441457a7d..254dd32b73 100644
--- a/app/assets/javascripts/discourse/components/modal-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/modal-panel.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Component.extend({
+export default Component.extend({
   panel: null,
 
   panelComponent: fmt("panel.id", "%@-panel"),
diff --git a/app/assets/javascripts/discourse/components/modal-tab.js.es6 b/app/assets/javascripts/discourse/components/modal-tab.js.es6
index c7a392507c..8508b37a87 100644
--- a/app/assets/javascripts/discourse/components/modal-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/modal-tab.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "li",
   classNames: ["modal-tab"],
   panel: null,
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index d8431f2820..5f0e584977 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
 import { WidgetClickHook } from "discourse/widgets/hooks";
 import { queryRegistry } from "discourse/widgets/widget";
@@ -14,7 +15,7 @@ export function resetWidgetCleanCallbacks() {
   _cleanCallbacks = {};
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   _tree: null,
   _rootNode: null,
   _timeout: null,
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6
index 2cff295403..556c808585 100644
--- a/app/assets/javascripts/discourse/components/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/components/nav-item.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 /* You might be looking for navigation-item. */
 import { iconHTML } from "discourse-common/lib/icon-library";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "li",
   classNameBindings: ["active"],
   router: Ember.inject.service(),
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 4be9c2c055..01dacde789 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -5,7 +6,7 @@ import {
 import DiscourseURL from "discourse/lib/url";
 import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "ul",
   classNameBindings: [":nav", ":nav-pills"],
   elementId: "navigation-bar",
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 10290334a7..a3403573fd 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "li",
     classNameBindings: [
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js.es6 b/app/assets/javascripts/discourse/components/plugin-connector.js.es6
index 76590147ce..715cb62965 100644
--- a/app/assets/javascripts/discourse/components/plugin-connector.js.es6
+++ b/app/assets/javascripts/discourse/components/plugin-connector.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
index 36b8929157..14e3805964 100644
--- a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 /**
    A plugin outlet is an extension point for templates where other templates can
    be inserted by plugins.
@@ -31,7 +32,7 @@
 **/
 import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "span",
   connectors: null,
 
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index 5f4fda605c..38e8fb1503 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import {
   default as computed,
@@ -5,7 +6,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classNameBindings: [":popup-tip", "good", "bad", "lastShownAt::hide"],
     animateAttribute: null,
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
index b0e84c117d..7ae299f5de 100644
--- a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["controls"],
 
   @computed("labelKey")
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
index 458fa3cebd..b6c9df818b 100644
--- a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   on
@@ -5,7 +6,7 @@ import {
 
 const USER_DISMISSED_PROMPT_KEY = "dismissed-pwa-install-banner";
 
-export default Ember.Component.extend({
+export default Component.extend({
   deferredInstallPromptEvent: null,
 
   _handleInstallPromptEvent(event) {
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index 9ac01abef4..f16bf6690d 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { selectedText } from "discourse/lib/utilities";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["quote-button"],
   classNameBindings: ["visible"],
   visible: false,
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js.es6
index 4a7929d058..3f6d5a6109 100644
--- a/app/assets/javascripts/discourse/components/radio-button.js.es6
+++ b/app/assets/javascripts/discourse/components/radio-button.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "input",
   type: "radio",
   attributeBindings: [
diff --git a/app/assets/javascripts/discourse/components/related-messages.js.es6 b/app/assets/javascripts/discourse/components/related-messages.js.es6
index e7d65a4591..bf95279941 100644
--- a/app/assets/javascripts/discourse/components/related-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/related-messages.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
-export default Ember.Component.extend({
+export default Component.extend({
   elementId: "related-messages",
   classNames: ["suggested-topics"],
 
diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6 b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
index d42a2dd290..1a11913067 100644
--- a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "",
 
   multiple: Ember.computed.gt("bundle.actions.length", 1),
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6 b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6
index d73a32d304..0583a4605f 100644
--- a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed
diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
index b57e6aa5de..2a6c31051c 100644
--- a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   showUsername: Ember.computed.gte("index", 1)
 });
diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
index 1916a96125..607d70dbda 100644
--- a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { longDate } from "discourse/lib/formatter";
 import { historyHeat } from "discourse/widgets/post-edits-indicator";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Component.extend({
+export default Component.extend({
   hasEdits: Ember.computed.gt("reviewable.post_version", 1),
 
   @computed("reviewable.post_updated_at")
diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6 b/app/assets/javascripts/discourse/components/reviewable-histories.js.es6
index a5f1a7932e..3bcf50b5e1 100644
--- a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-histories.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   filteredHistories: Ember.computed.filterBy("histories", "created", false)
 });
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
index 4507704d95..23f3b53479 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
@@ -7,7 +8,7 @@ import showModal from "discourse/lib/show-modal";
 
 let _components = {};
 
-export default Ember.Component.extend({
+export default Component.extend({
   adminTools: optionalService(),
   tagName: "",
   updating: null,
diff --git a/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6
index 1255c5bddc..2e17ce9423 100644
--- a/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Component.extend({
+export default Component.extend({
   actions: {
     showRawEmail() {
       showModal("raw-email").set("rawEmail", this.reviewable.payload.raw_email);
diff --git a/app/assets/javascripts/discourse/components/reviewable-user.js.es6 b/app/assets/javascripts/discourse/components/reviewable-user.js.es6
index f071ba7b33..ec065a0bde 100644
--- a/app/assets/javascripts/discourse/components/reviewable-user.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-user.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("reviewable.user_fields")
   userFields(fields) {
     return this.site.collectUserFields(fields);
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
index caad7dc87a..dad7447f0c 100644
--- a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
+++ b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import Scrolling from "discourse/mixins/scrolling";
 
-export default Ember.Component.extend(Scrolling, {
+export default Component.extend(Scrolling, {
   didReceiveAttrs() {
     this._super(...arguments);
 
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 50da93e6c2..333b6d6549 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 import Group from "discourse/models/group";
@@ -28,7 +29,7 @@ const REGEXP_POST_TIME_WHEN = /^(before|after)/gi;
 
 const IN_OPTIONS_MAPPING = { images: "with" };
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["search-advanced-options"],
 
   init() {
diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js.es6 b/app/assets/javascripts/discourse/components/second-factor-form.js.es6
index 572fd509f7..ce332c23b1 100644
--- a/app/assets/javascripts/discourse/components/second-factor-form.js.es6
+++ b/app/assets/javascripts/discourse/components/second-factor-form.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("secondFactorMethod")
   secondFactorTitle(secondFactorMethod) {
     switch (secondFactorMethod) {
diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js.es6 b/app/assets/javascripts/discourse/components/second-factor-input.js.es6
index 00e27039a4..97ce1a4fa7 100644
--- a/app/assets/javascripts/discourse/components/second-factor-input.js.es6
+++ b/app/assets/javascripts/discourse/components/second-factor-input.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("secondFactorMethod")
   type(secondFactorMethod) {
     if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) return "tel";
diff --git a/app/assets/javascripts/discourse/components/security-key-form.js.es6 b/app/assets/javascripts/discourse/components/security-key-form.js.es6
index 3161831869..d315bf6889 100644
--- a/app/assets/javascripts/discourse/components/security-key-form.js.es6
+++ b/app/assets/javascripts/discourse/components/security-key-form.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
-export default Ember.Component.extend({
+export default Component.extend({
   actions: {
     useAnotherMethod() {
       this.set("showSecurityKey", false);
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6
index 136e6a9ccc..65f5cfd964 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/share-panel.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import Sharing from "discourse/lib/sharing";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: null,
 
   type: Ember.computed.alias("panel.model.type"),
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 10e723a196..17e05c47c9 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
 import {
@@ -7,7 +8,7 @@ import {
 import Sharing from "discourse/lib/sharing";
 import { nativeShare } from "discourse/lib/pwa-utils";
 
-export default Ember.Component.extend({
+export default Component.extend({
   elementId: "share-link",
   classNameBindings: ["visible"],
   link: null,
diff --git a/app/assets/javascripts/discourse/components/share-source.js.es6 b/app/assets/javascripts/discourse/components/share-source.js.es6
index 0eb7020886..1ce8f6e5da 100644
--- a/app/assets/javascripts/discourse/components/share-source.js.es6
+++ b/app/assets/javascripts/discourse/components/share-source.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNameBindings: [":social-link"],
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
index 002a13e7da..b408ee87a1 100644
--- a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
   publishing: false,
 
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index 287e30c651..d7630e2681 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   action: "showCreateAccount",
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index b5756b859c..e8415f3498 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -1,8 +1,9 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
-export default Ember.Component.extend({
+export default Component.extend({
   elementId: "suggested-topics",
   classNames: ["suggested-topics"],
 
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
index ab41561429..73d20d7922 100644
--- a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "a",
   classNameBindings: [
     ":tag-badge-wrapper",
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js.es6
index e703a1801d..bc5dbe6531 100644
--- a/app/assets/javascripts/discourse/components/tag-list.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-list.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":tag-list", "categoryClass", "tagGroupNameClass"],
 
   isPrivateMessage: false,
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index a63b6fed5d..37a4cb2959 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     Ember.run.next(null, () => {
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js.es6
index bdeb1b3a72..c9c65e1034 100644
--- a/app/assets/javascripts/discourse/components/time-input.js.es6
+++ b/app/assets/javascripts/discourse/components/time-input.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { isNumeric } from "discourse/lib/utilities";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["d-time-input"],
   hours: null,
   minutes: null,
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6 b/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
index 059b1a1468..9c01cf1a1d 100644
--- a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["top-title-buttons"],
 
   @computed("period")
diff --git a/app/assets/javascripts/discourse/components/topic-category.js.es6 b/app/assets/javascripts/discourse/components/topic-category.js.es6
index 97fcde13cd..3f003c8d77 100644
--- a/app/assets/javascripts/discourse/components/topic-category.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-category.js.es6
@@ -1,2 +1,3 @@
+import Component from "@ember/component";
 // Injections don't occur without a class
-export default Ember.Component.extend();
+export default Component.extend();
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
index e90ccd5857..f55197d804 100644
--- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import CleansUp from "discourse/mixins/cleans-up";
 import computed from "ember-addons/ember-computed-decorators";
@@ -25,7 +26,7 @@ function entranceDate(dt, showTime) {
   );
 }
 
-export default Ember.Component.extend(CleansUp, {
+export default Component.extend(CleansUp, {
   elementId: "topic-entrance",
   classNameBindings: ["visible::hidden"],
   _position: null,
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index 0c487e7353..6845dc6f12 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { getTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
 
-export default Ember.Component.extend({
+export default Component.extend({
   elementId: "topic-footer-buttons",
 
   // Allow us to extend it
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.es6
index 1fd4f9264d..114e02aa04 100644
--- a/app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["topic-notice"],
 
   @computed("model.group.{full_name,name,allow_membership_requests}")
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index ad822dfb42..771d5dfb35 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -215,7 +216,7 @@ export const ListItemDefaults = {
   })
 };
 
-export default Ember.Component.extend(
+export default Component.extend(
   ListItemDefaults,
   bufferedRender({
     rerenderTriggers: ["bulkSelectEnabled", "topic.pinned"],
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 8eaa73dd26..c099c8b790 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
 
-export default Ember.Component.extend(LoadMore, {
+export default Component.extend(LoadMore, {
   tagName: "table",
   classNames: ["topic-list"],
   showTopicPostBadges: true,
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index 28cf8b4ae7..96db2ab095 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
 import PanEvents, {
@@ -6,7 +7,7 @@ import PanEvents, {
   SWIPE_VELOCITY_THRESHOLD
 } from "discourse/mixins/pan-events";
 
-export default Ember.Component.extend(PanEvents, {
+export default Component.extend(PanEvents, {
   composerOpen: null,
   info: null,
   isPanning: false,
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
index 69235be0ca..e6b70ab212 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 
 // Creates a link
@@ -12,7 +13,7 @@ function link(buffer, prop, url, cssClass, i18nKey, text) {
   );
 }
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     tagName: "span",
     classNameBindings: [":topic-post-badges"],
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index e37d5821c2..61db49b425 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   elementId: "topic-progress-wrapper",
   classNameBindings: ["docked"],
   docked: false,
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index d063847e83..dc3e0d14f6 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import { escapeExpression } from "discourse/lib/utilities";
 import TopicStatusIcons from "discourse/helpers/topic-status-icons";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classNames: ["topic-statuses"],
 
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 288e61b3bb..c7e2ed244a 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,10 +1,11 @@
+import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import Category from "discourse/models/category";
 import computed from "ember-addons/ember-computed-decorators";
 import { REMINDER_TYPE } from "discourse/controllers/edit-topic-timer";
 
-export default Ember.Component.extend(
+export default Component.extend(
   bufferedRender({
     classNames: ["topic-status-info"],
     _delayedRerender: null,
diff --git a/app/assets/javascripts/discourse/components/topic-title.js.es6 b/app/assets/javascripts/discourse/components/topic-title.js.es6
index 17f99b48ee..7bbc478cb3 100644
--- a/app/assets/javascripts/discourse/components/topic-title.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-title.js.es6
@@ -1,5 +1,6 @@
+import Component from "@ember/component";
 import KeyEnterEscape from "discourse/mixins/key-enter-escape";
 
-export default Ember.Component.extend(KeyEnterEscape, {
+export default Component.extend(KeyEnterEscape, {
   elementId: "topic-title"
 });
diff --git a/app/assets/javascripts/discourse/components/track-selected.js.es6 b/app/assets/javascripts/discourse/components/track-selected.js.es6
index bf720378b7..241cb64c7c 100644
--- a/app/assets/javascripts/discourse/components/track-selected.js.es6
+++ b/app/assets/javascripts/discourse/components/track-selected.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "span",
   selectionChanged: function() {
     const selected = this.selected;
diff --git a/app/assets/javascripts/discourse/components/user-badge.js.es6 b/app/assets/javascripts/discourse/components/user-badge.js.es6
index bca90d4435..85de291634 100644
--- a/app/assets/javascripts/discourse/components/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/components/user-badge.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "span",
 
   @computed("count")
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 981cbb125d..6a21948d33 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   observes
@@ -10,7 +11,7 @@ import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 
-export default Ember.Component.extend(
+export default Component.extend(
   CardContentsBase,
   CanCheckEmails,
   CleansUp,
diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js.es6
index 9851b45762..b54cbafd0a 100644
--- a/app/assets/javascripts/discourse/components/user-field.js.es6
+++ b/app/assets/javascripts/discourse/components/user-field.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { fmt } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":user-field", "field.field_type", "customFieldClass"],
   layoutName: fmt("field.field_type", "components/user-fields/%@"),
 
diff --git a/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6 b/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6
index 874f19c7bb..5c24fb70af 100644
--- a/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6
+++ b/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed("percentage")
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6
index 21a1347775..2353dbd553 100644
--- a/app/assets/javascripts/discourse/components/user-info.js.es6
+++ b/app/assets/javascripts/discourse/components/user-info.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { userPath } from "discourse/lib/url";
 
@@ -5,7 +6,7 @@ export function normalize(name) {
   return name.replace(/[\-\_ \.]/g, "").toLowerCase();
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":user-info", "size"],
   attributeBindings: ["data-username"],
   size: "small",
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js.es6
index 7b86bed4fd..cdc7640bb2 100644
--- a/app/assets/javascripts/discourse/components/user-link.js.es6
+++ b/app/assets/javascripts/discourse/components/user-link.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "a",
   attributeBindings: ["href", "data-user-card"],
   href: Ember.computed.alias("user.path"),
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 879198734c..90add32468 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["user-stat"],
   type: "number",
   isNumber: Ember.computed.equal("type", "number"),
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
index 332e16520d..f0c5ca36e5 100644
--- a/app/assets/javascripts/discourse/components/user-stream-item.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 import { actionDescription } from "discourse/widgets/post-small-action";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [
     ":user-stream-item",
     ":item", // DEPRECATED: 'item' class
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index ffb5c68603..cbb9b779bc 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 import ClickTrack from "discourse/lib/click-track";
 import Post from "discourse/models/post";
@@ -6,7 +7,7 @@ import Draft from "discourse/models/draft";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getOwner } from "discourse-common/lib/get-owner";
 
-export default Ember.Component.extend(LoadMore, {
+export default Component.extend(LoadMore, {
   _initialize: Ember.on("init", function() {
     const filter = this.get("stream.filter");
     if (filter) {
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.es6
index 86def06ee1..5206a83988 100644
--- a/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed("user", "category")
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
index b5deb64dc4..d566ee18ab 100644
--- a/app/assets/javascripts/discourse/components/user-summary-section.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["top-sub-section"]
 });
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
index 145b770e51..790c675e49 100644
--- a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "li"
 });
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.es6
index 5035daa2a7..39970994da 100644
--- a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 // should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
 const MAX_SUMMARY_RESULTS = 6;
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   @computed("items.length")
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js.es6 b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
index 145b770e51..790c675e49 100644
--- a/app/assets/javascripts/discourse/components/user-summary-user.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   tagName: "li"
 });
diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js.es6
index 68b1d1f480..16cc583f4f 100644
--- a/app/assets/javascripts/discourse/components/watch-read.js.es6
+++ b/app/assets/javascripts/discourse/components/watch-read.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import isElementInViewport from "discourse/lib/is-element-in-viewport";
 
-export default Ember.Component.extend({
+export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     const currentUser = this.currentUser;
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6 b/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
index abceda03ca..46f239534d 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
 
   showStatus: Ember.computed.gt("rs.status", 0),
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
index 1b81ae1eb2..0c542410fb 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   attributeBindings: [
     "tabindex",
     "ariaLabel:aria-label",
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js.es6 b/app/assets/javascripts/select-kit/components/pinned-button.js.es6
index 079274a2a8..9002d913b3 100644
--- a/app/assets/javascripts/select-kit/components/pinned-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-button.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   pluginApiIdentifiers: ["pinned-button"],
   descriptionKey: "help",
   classNames: "pinned-button",
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 d71651b8d5..51e16b0bd2 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 const { get, isNone, run, isEmpty, makeArray } = Ember;
 import computed from "ember-addons/ember-computed-decorators";
 import UtilsMixin from "select-kit/mixins/utils";
@@ -10,7 +11,7 @@ import {
   applyCollectionHeaderCallbacks
 } from "select-kit/mixins/plugin-api";
 
-export default Ember.Component.extend(
+export default Component.extend(
   UtilsMixin,
   PluginApiMixin,
   DomHelpersMixin,
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.es6
index fb1d041af5..cc2ff90a15 100644
--- 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.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   layoutName:
     "select-kit/templates/components/select-kit/select-kit-collection",
   classNames: ["select-kit-collection"],
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.es6
index 426261f4bf..9576816708 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 const { isEmpty } = Ember;
 
-export default Ember.Component.extend({
+export default Component.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-filter",
   classNames: ["select-kit-filter"],
   classNameBindings: ["isFocused", "isHidden"],
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.es6
index 00ffa0be87..807326c990 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 const { isEmpty, makeArray } = Ember;
 
-export default Ember.Component.extend({
+export default Component.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-header",
   classNames: ["select-kit-header"],
   classNameBindings: ["isFocused", "isNone"],
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.es6
index 330baedff7..5b016fe905 100644
--- 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.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
 const { run, isPresent, makeArray, isEmpty } = Ember;
 import UtilsMixin from "select-kit/mixins/utils";
 
-export default Ember.Component.extend(UtilsMixin, {
+export default Component.extend(UtilsMixin, {
   layoutName: "select-kit/templates/components/select-kit/select-kit-row",
   classNames: ["select-kit-row"],
   tagName: "li",
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 741b89106f..399e9b0e2f 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
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   layoutName: "select-kit/templates/components/topic-notifications-button",
   classNames: "topic-notifications-button",
   showFullTitle: true,
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
index 30ef3d178a..cc07ab1a2d 100644
--- a/app/assets/javascripts/wizard/components/invite-list-user.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["invite-list-user"],
 
   @computed("user.role")
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index 13902ca2d6..bbf0af5a1c 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNames: ["invite-list"],
   users: null,
   inviteEmail: "",
diff --git a/app/assets/javascripts/wizard/components/popular-themes.js.es6 b/app/assets/javascripts/wizard/components/popular-themes.js.es6
index e9b68dc80b..794d8925e1 100644
--- a/app/assets/javascripts/wizard/components/popular-themes.js.es6
+++ b/app/assets/javascripts/wizard/components/popular-themes.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["popular-themes"],
 
   init() {
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index 1dc2803cdd..b40d9839f1 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import { observes, on } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "label",
 
   click(e) {
diff --git a/app/assets/javascripts/wizard/components/staff-count.js.es6 b/app/assets/javascripts/wizard/components/staff-count.js.es6
index 7677d999de..2e7db93b3c 100644
--- a/app/assets/javascripts/wizard/components/staff-count.js.es6
+++ b/app/assets/javascripts/wizard/components/staff-count.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   @computed("field.value")
   showStaffCount: staffCount => staffCount > 1
 });
diff --git a/app/assets/javascripts/wizard/components/theme-previews.js.es6 b/app/assets/javascripts/wizard/components/theme-previews.js.es6
index 57c74ccab2..6afd85cbff 100644
--- a/app/assets/javascripts/wizard/components/theme-previews.js.es6
+++ b/app/assets/javascripts/wizard/components/theme-previews.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   actions: {
     changed(value) {
       this.set("field.value", value);
diff --git a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6 b/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
index bed1a2f9a9..81dbc2c3af 100644
--- a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 const MAX_PARTICLES = 150;
 
 const SIZE = 144;
@@ -52,7 +53,7 @@ class Particle {
   }
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["wizard-canvas"],
   tagName: "canvas",
   ctx: null,
diff --git a/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
index 3747a92bca..85ab4032d4 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   keyPress(e) {
     e.stopPropagation();
   }
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
index 86de715b70..f2022c3ec7 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
@@ -1,9 +1,10 @@
+import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import computed from "ember-addons/ember-computed-decorators";
 import { getToken } from "wizard/lib/ajax";
 import { getOwner } from "discourse-common/lib/get-owner";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["wizard-image-row"],
   uploading: false,
 
diff --git a/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
index 57c74ccab2..6afd85cbff 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   actions: {
     changed(value) {
       this.set("field.value", value);
diff --git a/app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6
index 3747a92bca..85ab4032d4 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   keyPress(e) {
     e.stopPropagation();
   }
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js.es6
index 7eff48c1b0..f3f7e80523 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":wizard-field", "typeClass", "field.invalid"],
 
   @computed("field.type")
diff --git a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6 b/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
index c616083ad6..f3c31f1346 100644
--- a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Component.extend({
+import Component from "@ember/component";
+export default Component.extend({
   classNameBindings: [":wizard-image-preview", "fieldClass"]
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6 b/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
index a60d5b39cb..7bc7a8446e 100644
--- a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
@@ -1,6 +1,7 @@
+import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNameBindings: [":wizard-step-form", "customStepClass"],
 
   @computed("step.id")
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index 38c47b2d90..c938d1e167 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import {
   default as computed,
@@ -22,7 +23,7 @@ jQuery.fn.wiggle = function(times, duration) {
 
 const alreadyWarned = {};
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ["wizard-step"],
   saving: null,
 
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6
index 307fc0126a..0ee5a35b27 100644
--- a/app/assets/javascripts/wizard/lib/preview.js.es6
+++ b/app/assets/javascripts/wizard/lib/preview.js.es6
@@ -1,3 +1,4 @@
+import Component from "@ember/component";
 /*eslint no-bitwise:0 */
 import getUrl from "discourse-common/lib/get-url";
 
@@ -31,7 +32,7 @@ function canvasFor(image, w, h) {
 
 export function createPreviewComponent(width, height, obj) {
   const scale = window.devicePixelRatio;
-  return Ember.Component.extend(
+  return Component.extend(
     {
       layoutName: "components/theme-preview",
       width,
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 918f8fdc08..6b2f7776f0 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,3 +1,4 @@
+import Component from "@ember/component";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
 import loadScript from "discourse/lib/load-script";
@@ -5,7 +6,7 @@ import { default as computed } from "ember-addons/ember-computed-decorators";
 import { cookAsync } from "discourse/lib/text";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Component.extend({
+export default Component.extend({
   timeFormat: "HH:mm:ss",
   dateFormat: "YYYY-MM-DD",
   dateTimeFormat: "YYYY-MM-DD HH:mm:ss",
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 18cfd47d92..c6818bb2ce 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,3 +1,4 @@
+import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import {
   default as computed,
@@ -8,7 +9,7 @@ import {
 export const keepAliveDuration = 10000;
 export const bufferTime = 3000;
 
-export default Ember.Component.extend({
+export default Component.extend({
   // Passed in variables
   action: null,
   post: null,
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 7cab2563cb..e6861cdf6b 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,3 +1,4 @@
+import Component from "@ember/component";
 import {
   default as computed,
   on
@@ -9,7 +10,7 @@ import {
 
 const MB_GET_LAST_MESSAGE = -2;
 
-export default Ember.Component.extend({
+export default Component.extend({
   topicId: null,
   presenceUsers: null,
 

From dd3ace5c77ab18a6733f8747e03f4c9e429f3d5c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 12:39:32 -0400
Subject: [PATCH 144/328] REFACTOR: Replace `Ember.Route` with proper import

---
 app/assets/javascripts/admin/routes/admin-api-index.js.es6    | 4 +++-
 app/assets/javascripts/admin/routes/admin-api-keys.js.es6     | 3 ++-
 .../javascripts/admin/routes/admin-backups-index.js.es6       | 3 ++-
 app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 | 3 ++-
 app/assets/javascripts/admin/routes/admin-badges-index.js.es6 | 3 ++-
 app/assets/javascripts/admin/routes/admin-badges-show.js.es6  | 3 ++-
 .../admin/routes/admin-customize-colors-show.js.es6           | 3 ++-
 .../javascripts/admin/routes/admin-customize-colors.js.es6    | 3 ++-
 .../admin/routes/admin-customize-email-style-edit.js.es6      | 3 ++-
 .../admin/routes/admin-customize-email-style.js.es6           | 3 ++-
 .../admin/routes/admin-customize-email-templates-edit.js.es6  | 3 ++-
 .../admin/routes/admin-customize-email-templates.js.es6       | 3 ++-
 .../javascripts/admin/routes/admin-customize-index.js.es6     | 3 ++-
 .../admin/routes/admin-customize-robots-txt.js.es6            | 3 ++-
 .../admin/routes/admin-customize-themes-edit.js.es6           | 3 ++-
 .../admin/routes/admin-customize-themes-index.js.es6          | 3 ++-
 .../admin/routes/admin-customize-themes-show.js.es6           | 3 ++-
 .../javascripts/admin/routes/admin-customize-themes.js.es6    | 3 ++-
 app/assets/javascripts/admin/routes/admin-embedding.js.es6    | 3 ++-
 app/assets/javascripts/admin/routes/admin-plugins.js.es6      | 3 ++-
 .../javascripts/admin/routes/admin-site-text-edit.js.es6      | 3 ++-
 .../javascripts/admin/routes/admin-site-text-index.js.es6     | 3 ++-
 app/assets/javascripts/admin/routes/admin-web-hooks.js.es6    | 3 ++-
 .../discourse/routes/account-created-edit-email.js.es6        | 3 ++-
 .../javascripts/discourse/routes/account-created-index.js.es6 | 3 ++-
 .../discourse/routes/account-created-resent.js.es6            | 3 ++-
 .../javascripts/discourse/routes/account-created.js.es6       | 3 ++-
 .../javascripts/discourse/routes/group-messages-index.js.es6  | 3 ++-
 app/assets/javascripts/wizard/routes/application.js.es6       | 3 ++-
 app/assets/javascripts/wizard/routes/index.js.es6             | 3 ++-
 app/assets/javascripts/wizard/routes/step.js.es6              | 3 ++-
 31 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
index c66efab129..f770f90c91 100644
--- a/app/assets/javascripts/admin/routes/admin-api-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
@@ -1,4 +1,6 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+
+export default Route.extend({
   beforeModel() {
     this.transitionTo("adminApiKeys");
   }
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
index 4332cb0adc..1826277567 100644
--- a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import ApiKey from "admin/models/api-key";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return ApiKey.find();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
index 39ed982a78..d20da4ac50 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import Backup from "admin/models/backup";
 
-export default Ember.Route.extend({
+export default Route.extend({
   activate() {
     this.messageBus.subscribe("/admin/backups", backups =>
       this.controller.set("model", backups.map(backup => Backup.create(backup)))
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index a0febc3d1d..58baa13587 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import PreloadStore from "preload-store";
 
-export default Ember.Route.extend({
+export default Route.extend({
   // since the logs are pushed via the message bus
   // we only want to preload them (hence the beforeModel hook)
   beforeModel() {
diff --git a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-index.js.es6
index 84a5bee571..36a4414877 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-index.js.es6
@@ -1,3 +1,4 @@
+import Route from "@ember/routing/route";
 import { emojiUrlFor } from "discourse/lib/text";
 
 const badgeIntroLinks = [
@@ -13,7 +14,7 @@ const badgeIntroLinks = [
   }
 ];
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController(controller) {
     controller.setProperties({
       badgeIntroLinks,
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 7837d1b30d..039231e897 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -1,8 +1,9 @@
+import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Route.extend({
+export default Route.extend({
   serialize(m) {
     return { badge_id: Ember.get(m, "id") || "new" };
   },
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.es6
index 545a09ad9b..146a3a61a9 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomize.colors");
     const model = all.findBy("id", parseInt(params.scheme_id));
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
index f4853fda28..835814df07 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import ColorScheme from "admin/models/color-scheme";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return ColorScheme.findAll();
   },
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.es6
index 74649c1a00..8dcc18f0d9 100644
--- 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.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     return {
       model: this.modelFor("adminCustomizeEmailStyle"),
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.es6
index 8e202e62bd..d63186e0eb 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.find("email-style");
   },
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.es6
index a6f170b09e..0bf85baf4a 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomizeEmailTemplates");
     return all.findBy("id", params.id);
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.es6
index fa6d3041a6..39b04b835f 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.findAll("email-template");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
index 10d55df015..9c593b7e25 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   beforeModel() {
     this.transitionTo("adminCustomizeThemes");
   }
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.es6
index 50acd6cac1..866d7cf8ec 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return ajax("/admin/customize/robots");
   }
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.es6
index 2e37bdc1ce..335e9fd578 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
     const model = all.findBy("id", parseInt(params.theme_id));
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.es6
index ea09122d62..425a04617a 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
@@ -1,3 +1,4 @@
+import Route from "@ember/routing/route";
 import { emojiUrlFor } from "discourse/lib/text";
 
 const externalResources = [
@@ -18,7 +19,7 @@ const externalResources = [
   }
 ];
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController(controller) {
     this._super(...arguments);
     this.controllerFor("adminCustomizeThemes").set("editingTheme", false);
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.es6
index a0ca4feef8..c9573fd8ac 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
@@ -1,7 +1,8 @@
+import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { THEMES, COMPONENTS } from "admin/models/theme";
 
-export default Ember.Route.extend({
+export default Route.extend({
   serialize(model) {
     return { theme_id: model.get("id") };
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
index 91c7ec5b76..7f7274ee0e 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return this.store.findAll("theme");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js.es6
index d698c52450..080dce2083 100644
--- a/app/assets/javascripts/admin/routes/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-embedding.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.find("embedding");
   },
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
index 06ea7eb259..c4af286faf 100644
--- a/app/assets/javascripts/admin/routes/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.findAll("plugin");
   },
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.es6
index 00ccca0256..c423eae45a 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     return this.store.find("site-text", params.id);
   },
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.es6
index dfec2f64d3..2c0e365322 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Route.extend({
+export default Route.extend({
   queryParams: {
     q: { replace: true },
     overridden: { replace: true }
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
index eed884a8ab..30daf6b6cb 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model() {
     return this.store.findAll("web-hook");
   },
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.es6
index 0922f7fe09..0946fe05db 100644
--- a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   setupController(controller) {
     const accountCreated = this.controllerFor("account-created").get(
       "accountCreated"
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js.es6 b/app/assets/javascripts/discourse/routes/account-created-index.js.es6
index 33aa658049..d3f46333a6 100644
--- a/app/assets/javascripts/discourse/routes/account-created-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   setupController(controller) {
     controller.set(
       "accountCreated",
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6 b/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
index deb2af1970..047906d262 100644
--- a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   setupController(controller) {
     controller.set(
       "email",
diff --git a/app/assets/javascripts/discourse/routes/account-created.js.es6 b/app/assets/javascripts/discourse/routes/account-created.js.es6
index ab117f5988..901f6c0ffb 100644
--- a/app/assets/javascripts/discourse/routes/account-created.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import PreloadStore from "preload-store";
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController(controller) {
     controller.set("accountCreated", PreloadStore.get("accountCreated"));
   }
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
index 68750d154a..be802450b2 100644
--- a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages-index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   beforeModel: function() {
     this.transitionTo("group.messages.inbox");
   }
diff --git a/app/assets/javascripts/wizard/routes/application.js.es6 b/app/assets/javascripts/wizard/routes/application.js.es6
index d460cdcc9a..6ac24a8efd 100644
--- a/app/assets/javascripts/wizard/routes/application.js.es6
+++ b/app/assets/javascripts/wizard/routes/application.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { findWizard } from "wizard/models/wizard";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return findWizard();
   },
diff --git a/app/assets/javascripts/wizard/routes/index.js.es6 b/app/assets/javascripts/wizard/routes/index.js.es6
index 9c82ae5246..5d8ab072ea 100644
--- a/app/assets/javascripts/wizard/routes/index.js.es6
+++ b/app/assets/javascripts/wizard/routes/index.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   beforeModel() {
     const appModel = this.modelFor("application");
     this.replaceWith("step", appModel.start);
diff --git a/app/assets/javascripts/wizard/routes/step.js.es6 b/app/assets/javascripts/wizard/routes/step.js.es6
index 4bafdfc115..21b6853044 100644
--- a/app/assets/javascripts/wizard/routes/step.js.es6
+++ b/app/assets/javascripts/wizard/routes/step.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Route.extend({
+import Route from "@ember/routing/route";
+export default Route.extend({
   model(params) {
     const allSteps = this.modelFor("application").steps;
     const step = allSteps.findBy("id", params.step_id);

From 0b37a3c2359f0896212b3bc1e72fcc6133292fae Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 12:41:58 -0400
Subject: [PATCH 145/328] Additioning Linting fixes

---
 .../components/discovery-topics-list.js.es6   |  80 ++--
 .../components/user-card-contents.js.es6      | 360 +++++++++---------
 2 files changed, 213 insertions(+), 227 deletions(-)

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 5f92bc7fb8..c9b2bb92bb 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -3,54 +3,50 @@ import { on, observes } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
 import UrlRefresh from "discourse/mixins/url-refresh";
 
-const DiscoveryTopicsListComponent = Component.extend(
-  UrlRefresh,
-  LoadMore,
-  {
-    classNames: ["contents"],
-    eyelineSelector: ".topic-list-item",
+const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
+  classNames: ["contents"],
+  eyelineSelector: ".topic-list-item",
 
-    @on("didInsertElement")
-    @observes("model")
-    _readjustScrollPosition() {
-      const scrollTo = this.session.get("topicListScrollPosition");
-      if (scrollTo && scrollTo >= 0) {
-        Ember.run.schedule("afterRender", () =>
-          $(window).scrollTop(scrollTo + 1)
-        );
-      } else {
-        Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
-      }
-    },
+  @on("didInsertElement")
+  @observes("model")
+  _readjustScrollPosition() {
+    const scrollTo = this.session.get("topicListScrollPosition");
+    if (scrollTo && scrollTo >= 0) {
+      Ember.run.schedule("afterRender", () =>
+        $(window).scrollTop(scrollTo + 1)
+      );
+    } else {
+      Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
+    }
+  },
 
-    @observes("topicTrackingState.states")
-    _updateTopics() {
-      this.topicTrackingState.updateTopics(this.model.topics);
-    },
+  @observes("topicTrackingState.states")
+  _updateTopics() {
+    this.topicTrackingState.updateTopics(this.model.topics);
+  },
 
-    @observes("incomingCount")
-    _updateTitle() {
-      Discourse.updateContextCount(this.incomingCount);
-    },
+  @observes("incomingCount")
+  _updateTitle() {
+    Discourse.updateContextCount(this.incomingCount);
+  },
 
-    saveScrollPosition() {
-      this.session.set("topicListScrollPosition", $(window).scrollTop());
-    },
+  saveScrollPosition() {
+    this.session.set("topicListScrollPosition", $(window).scrollTop());
+  },
 
-    actions: {
-      loadMore() {
-        Discourse.updateContextCount(0);
-        this.model.loadMore().then(hasMoreResults => {
-          Ember.run.schedule("afterRender", () => this.saveScrollPosition());
-          if (!hasMoreResults) {
-            this.eyeline.flushRest();
-          } else if ($(window).height() >= $(document).height()) {
-            this.send("loadMore");
-          }
-        });
-      }
+  actions: {
+    loadMore() {
+      Discourse.updateContextCount(0);
+      this.model.loadMore().then(hasMoreResults => {
+        Ember.run.schedule("afterRender", () => this.saveScrollPosition());
+        if (!hasMoreResults) {
+          this.eyeline.flushRest();
+        } else if ($(window).height() >= $(document).height()) {
+          this.send("loadMore");
+        }
+      });
     }
   }
-);
+});
 
 export default DiscoveryTopicsListComponent;
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 6a21948d33..882e13dc45 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -11,213 +11,203 @@ import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 
-export default Component.extend(
-  CardContentsBase,
-  CanCheckEmails,
-  CleansUp,
-  {
-    elementId: "user-card",
-    triggeringLinkClass: "mention",
-    classNameBindings: [
-      "visible:show",
-      "showBadges",
-      "user.card_background::no-bg",
-      "isFixed:fixed",
-      "usernameClass"
-    ],
-    allowBackgrounds: setting("allow_profile_backgrounds"),
-    showBadges: setting("enable_badges"),
+export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
+  elementId: "user-card",
+  triggeringLinkClass: "mention",
+  classNameBindings: [
+    "visible:show",
+    "showBadges",
+    "user.card_background::no-bg",
+    "isFixed:fixed",
+    "usernameClass"
+  ],
+  allowBackgrounds: setting("allow_profile_backgrounds"),
+  showBadges: setting("enable_badges"),
 
-    postStream: Ember.computed.alias("topic.postStream"),
-    enoughPostsForFiltering: Ember.computed.gte("topicPostCount", 2),
-    showFilter: Ember.computed.and(
-      "viewingTopic",
-      "postStream.hasNoFilters",
-      "enoughPostsForFiltering"
-    ),
-    showName: propertyNotEqual("user.name", "user.username"),
-    hasUserFilters: Ember.computed.gt("postStream.userFilters.length", 0),
-    showMoreBadges: Ember.computed.gt("moreBadgesCount", 0),
-    showDelete: Ember.computed.and(
-      "viewingAdmin",
-      "showName",
-      "user.canBeDeleted"
-    ),
-    linkWebsite: Ember.computed.not("user.isBasic"),
-    hasLocationOrWebsite: Ember.computed.or(
-      "user.location",
-      "user.website_name"
-    ),
-    isSuspendedOrHasBio: Ember.computed.or(
-      "user.suspend_reason",
-      "user.bio_cooked"
-    ),
-    showCheckEmail: Ember.computed.and("user.staged", "canCheckEmails"),
+  postStream: Ember.computed.alias("topic.postStream"),
+  enoughPostsForFiltering: Ember.computed.gte("topicPostCount", 2),
+  showFilter: Ember.computed.and(
+    "viewingTopic",
+    "postStream.hasNoFilters",
+    "enoughPostsForFiltering"
+  ),
+  showName: propertyNotEqual("user.name", "user.username"),
+  hasUserFilters: Ember.computed.gt("postStream.userFilters.length", 0),
+  showMoreBadges: Ember.computed.gt("moreBadgesCount", 0),
+  showDelete: Ember.computed.and(
+    "viewingAdmin",
+    "showName",
+    "user.canBeDeleted"
+  ),
+  linkWebsite: Ember.computed.not("user.isBasic"),
+  hasLocationOrWebsite: Ember.computed.or("user.location", "user.website_name"),
+  isSuspendedOrHasBio: Ember.computed.or(
+    "user.suspend_reason",
+    "user.bio_cooked"
+  ),
+  showCheckEmail: Ember.computed.and("user.staged", "canCheckEmails"),
 
-    user: null,
+  user: null,
 
-    // If inside a topic
-    topicPostCount: null,
+  // If inside a topic
+  topicPostCount: null,
 
-    @computed("user.staff")
-    staff: isStaff => (isStaff ? "staff" : ""),
+  @computed("user.staff")
+  staff: isStaff => (isStaff ? "staff" : ""),
 
-    @computed("user.trust_level")
-    newUser: trustLevel => (trustLevel === 0 ? "new-user" : ""),
+  @computed("user.trust_level")
+  newUser: trustLevel => (trustLevel === 0 ? "new-user" : ""),
 
-    @computed("user.name")
-    nameFirst(name) {
-      return prioritizeNameInUx(name, this.siteSettings);
-    },
+  @computed("user.name")
+  nameFirst(name) {
+    return prioritizeNameInUx(name, this.siteSettings);
+  },
 
-    @computed("username")
-    usernameClass: username => (username ? `user-card-${username}` : ""),
+  @computed("username")
+  usernameClass: username => (username ? `user-card-${username}` : ""),
 
-    @computed("username", "topicPostCount")
-    togglePostsLabel(username, count) {
-      return I18n.t("topic.filter_to", { username, count });
-    },
+  @computed("username", "topicPostCount")
+  togglePostsLabel(username, count) {
+    return I18n.t("topic.filter_to", { username, count });
+  },
 
-    @computed("user.user_fields.@each.value")
-    publicUserFields() {
-      const siteUserFields = this.site.get("user_fields");
-      if (!Ember.isEmpty(siteUserFields)) {
-        const userFields = this.get("user.user_fields");
-        return siteUserFields
-          .filterBy("show_on_user_card", true)
-          .sortBy("position")
-          .map(field => {
-            Ember.set(field, "dasherized_name", field.get("name").dasherize());
-            const value = userFields ? userFields[field.get("id")] : null;
-            return Ember.isEmpty(value)
-              ? null
-              : Ember.Object.create({ value, field });
-          })
-          .compact();
-      }
-    },
-
-    @computed("user.trust_level")
-    removeNoFollow(trustLevel) {
-      return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
-    },
-
-    @computed("user.badge_count", "user.featured_user_badges.length")
-    moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
-
-    @computed("user.time_read", "user.recent_time_read")
-    showRecentTimeRead(timeRead, recentTimeRead) {
-      return timeRead !== recentTimeRead && recentTimeRead !== 0;
-    },
-
-    @computed("user.recent_time_read")
-    recentTimeRead(recentTimeReadSeconds) {
-      return durationTiny(recentTimeReadSeconds);
-    },
-
-    @computed("showRecentTimeRead", "user.time_read", "recentTimeRead")
-    timeReadTooltip(showRecent, timeRead, recentTimeRead) {
-      if (showRecent) {
-        return I18n.t("time_read_recently_tooltip", {
-          time_read: durationTiny(timeRead),
-          recent_time_read: recentTimeRead
-        });
-      } else {
-        return I18n.t("time_read_tooltip", {
-          time_read: durationTiny(timeRead)
-        });
-      }
-    },
-
-    @observes("user.card_background_upload_url")
-    addBackground() {
-      if (!this.allowBackgrounds) {
-        return;
-      }
-
-      const thisElem = this.element;
-      if (!thisElem) {
-        return;
-      }
-
-      const url = this.get("user.card_background_upload_url");
-      const bg = Ember.isEmpty(url)
-        ? ""
-        : `url(${Discourse.getURLWithCDN(url)})`;
-      thisElem.style.backgroundImage = bg;
-    },
-
-    _showCallback(username, $target) {
-      this._positionCard($target);
-      this.setProperties({ visible: true, loading: true });
-
-      const args = { stats: false };
-      args.include_post_count_for = this.get("topic.id");
-      User.findByUsername(username, args)
-        .then(user => {
-          if (user.topic_post_count) {
-            this.set(
-              "topicPostCount",
-              user.topic_post_count[args.include_post_count_for]
-            );
-          }
-          this.setProperties({ user });
+  @computed("user.user_fields.@each.value")
+  publicUserFields() {
+    const siteUserFields = this.site.get("user_fields");
+    if (!Ember.isEmpty(siteUserFields)) {
+      const userFields = this.get("user.user_fields");
+      return siteUserFields
+        .filterBy("show_on_user_card", true)
+        .sortBy("position")
+        .map(field => {
+          Ember.set(field, "dasherized_name", field.get("name").dasherize());
+          const value = userFields ? userFields[field.get("id")] : null;
+          return Ember.isEmpty(value)
+            ? null
+            : Ember.Object.create({ value, field });
         })
-        .catch(() => this._close())
-        .finally(() => this.set("loading", null));
-    },
+        .compact();
+    }
+  },
 
-    _close() {
-      this._super(...arguments);
+  @computed("user.trust_level")
+  removeNoFollow(trustLevel) {
+    return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
+  },
 
-      this.setProperties({
-        user: null,
-        topicPostCount: null
+  @computed("user.badge_count", "user.featured_user_badges.length")
+  moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
+
+  @computed("user.time_read", "user.recent_time_read")
+  showRecentTimeRead(timeRead, recentTimeRead) {
+    return timeRead !== recentTimeRead && recentTimeRead !== 0;
+  },
+
+  @computed("user.recent_time_read")
+  recentTimeRead(recentTimeReadSeconds) {
+    return durationTiny(recentTimeReadSeconds);
+  },
+
+  @computed("showRecentTimeRead", "user.time_read", "recentTimeRead")
+  timeReadTooltip(showRecent, timeRead, recentTimeRead) {
+    if (showRecent) {
+      return I18n.t("time_read_recently_tooltip", {
+        time_read: durationTiny(timeRead),
+        recent_time_read: recentTimeRead
       });
-    },
+    } else {
+      return I18n.t("time_read_tooltip", {
+        time_read: durationTiny(timeRead)
+      });
+    }
+  },
 
-    cleanUp() {
+  @observes("user.card_background_upload_url")
+  addBackground() {
+    if (!this.allowBackgrounds) {
+      return;
+    }
+
+    const thisElem = this.element;
+    if (!thisElem) {
+      return;
+    }
+
+    const url = this.get("user.card_background_upload_url");
+    const bg = Ember.isEmpty(url) ? "" : `url(${Discourse.getURLWithCDN(url)})`;
+    thisElem.style.backgroundImage = bg;
+  },
+
+  _showCallback(username, $target) {
+    this._positionCard($target);
+    this.setProperties({ visible: true, loading: true });
+
+    const args = { stats: false };
+    args.include_post_count_for = this.get("topic.id");
+    User.findByUsername(username, args)
+      .then(user => {
+        if (user.topic_post_count) {
+          this.set(
+            "topicPostCount",
+            user.topic_post_count[args.include_post_count_for]
+          );
+        }
+        this.setProperties({ user });
+      })
+      .catch(() => this._close())
+      .finally(() => this.set("loading", null));
+  },
+
+  _close() {
+    this._super(...arguments);
+
+    this.setProperties({
+      user: null,
+      topicPostCount: null
+    });
+  },
+
+  cleanUp() {
+    this._close();
+  },
+
+  actions: {
+    close() {
       this._close();
     },
 
-    actions: {
-      close() {
-        this._close();
-      },
+    composePM(user, post) {
+      this._close();
 
-      composePM(user, post) {
-        this._close();
+      Ember.getOwner(this)
+        .lookup("router:main")
+        .send("composePrivateMessage", user, post);
+    },
 
-        Ember.getOwner(this)
-          .lookup("router:main")
-          .send("composePrivateMessage", user, post);
-      },
+    cancelFilter() {
+      const postStream = this.postStream;
+      postStream.cancelFilter();
+      postStream.refresh();
+      this._close();
+    },
 
-      cancelFilter() {
-        const postStream = this.postStream;
-        postStream.cancelFilter();
-        postStream.refresh();
-        this._close();
-      },
+    togglePosts() {
+      this.togglePosts(this.user);
+      this._close();
+    },
 
-      togglePosts() {
-        this.togglePosts(this.user);
-        this._close();
-      },
+    deleteUser() {
+      this.user.delete();
+      this._close();
+    },
 
-      deleteUser() {
-        this.user.delete();
-        this._close();
-      },
+    showUser(username) {
+      this.showUser(username);
+      this._close();
+    },
 
-      showUser(username) {
-        this.showUser(username);
-        this._close();
-      },
-
-      checkEmail(user) {
-        user.checkEmail();
-      }
+    checkEmail(user) {
+      user.checkEmail();
     }
   }
-);
+});

From e18af18feccfa0ba47e55a3e972608241fb6cbf0 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 12:55:11 -0400
Subject: [PATCH 146/328] Support and examples for `Ember.Object` and
 `Ember.Controller` imports

We should stop using global variables and instead import these as
needed.
---
 app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 | 3 ++-
 app/assets/javascripts/admin/models/watched-word.js.es6        | 3 ++-
 app/assets/javascripts/discourse-loader.js                     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
index 87b26f5ef1..9cd1682ff6 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
@@ -1,7 +1,8 @@
 import ApiKey from "admin/models/api-key";
 import { default as computed } from "ember-addons/ember-computed-decorators";
+import Controller from "@ember/controller";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.[]")
   hasMasterKey(model) {
     return !!model.findBy("user", null);
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js.es6
index 9f335032e3..b9ef7380b6 100644
--- a/app/assets/javascripts/admin/models/watched-word.js.es6
+++ b/app/assets/javascripts/admin/models/watched-word.js.es6
@@ -1,4 +1,5 @@
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";
 
 const WatchedWord = Discourse.Model.extend({
   save() {
@@ -37,7 +38,7 @@ WatchedWord.reopenClass({
       });
 
       return Object.keys(actions).map(n => {
-        return Ember.Object.create({
+        return EmberObject.create({
           nameKey: n,
           name: I18n.t("admin.watched_words.actions." + n),
           words: actions[n],
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 8d2d9ffb97..f20e7d1ab7 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -6,6 +6,8 @@ var define, requirejs;
   if (typeof Ember !== "undefined") {
     EMBER_MODULES = {
       "@ember/component": { default: Ember.Component },
+      "@ember/controller": { default: Ember.Controller },
+      "@ember/object": { default: Ember.Object },
       "@ember/routing/route": { default: Ember.Route }
     };
   }

From 6287eccb356fa12d7738aca10af7c01294c6d2ac Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 13:06:54 -0400
Subject: [PATCH 147/328] REFACTOR: Remove `Ember.Controller` in favor of
 import

---
 .../controllers/admin-backups-index.js.es6    |   3 +-
 .../controllers/admin-backups-logs.js.es6     |   3 +-
 .../admin/controllers/admin-backups.js.es6    |   3 +-
 .../controllers/admin-badges-show.js.es6      |   3 +-
 .../admin/controllers/admin-badges.js.es6     |   3 +-
 .../admin-customize-colors-show.js.es6        |   3 +-
 .../controllers/admin-customize-colors.js.es6 |   3 +-
 .../admin-customize-email-style-edit.js.es6   |   3 +-
 ...dmin-customize-email-templates-edit.js.es6 |   3 +-
 .../admin-customize-email-templates.js.es6    |   3 +-
 .../admin-customize-robots-txt.js.es6         |   3 +-
 .../admin-customize-themes-edit.js.es6        |   3 +-
 .../admin-customize-themes-show.js.es6        |   3 +-
 .../controllers/admin-customize-themes.js.es6 |   3 +-
 .../admin-dashboard-general.js.es6            |   3 +-
 .../admin-dashboard-moderation.js.es6         |   3 +-
 .../admin-dashboard-reports.js.es6            |   3 +-
 .../admin/controllers/admin-dashboard.js.es6  |   3 +-
 .../admin-email-advanced-test.js.es6          |   3 +-
 .../controllers/admin-email-index.js.es6      |   3 +-
 .../admin/controllers/admin-email-logs.js.es6 |   3 +-
 .../admin-email-preview-digest.js.es6         |   3 +-
 .../admin/controllers/admin-embedding.js.es6  |   3 +-
 .../admin/controllers/admin-emojis.js.es6     |   3 +-
 .../admin-logs-screened-emails.js.es6         |   3 +-
 .../admin-logs-screened-ip-addresses.js.es6   |   3 +-
 .../admin-logs-screened-urls.js.es6           |   3 +-
 .../admin-logs-staff-action-logs.js.es6       |   3 +-
 .../admin/controllers/admin-permalinks.js.es6 |   3 +-
 .../admin/controllers/admin-plugins.js.es6    |   3 +-
 .../controllers/admin-reports-show.js.es6     |   3 +-
 .../admin-search-logs-index.js.es6            |   3 +-
 .../controllers/admin-search-logs-term.js.es6 |   3 +-
 .../admin-site-settings-category.js.es6       |   3 +-
 .../controllers/admin-site-settings.js.es6    |   3 +-
 .../controllers/admin-site-text-edit.js.es6   |   3 +-
 .../controllers/admin-site-text-index.js.es6  |   3 +-
 .../controllers/admin-user-badges.js.es6      |   3 +-
 .../controllers/admin-user-fields.js.es6      |   3 +-
 .../admin/controllers/admin-user-index.js.es6 |   3 +-
 .../admin/controllers/admin-user.js.es6       |   3 +-
 .../controllers/admin-users-list-show.js.es6  |   3 +-
 .../admin-watched-words-action.js.es6         |   3 +-
 .../controllers/admin-watched-words.js.es6    |   3 +-
 .../admin-web-hooks-show-events.js.es6        |   3 +-
 .../controllers/admin-web-hooks-show.js.es6   |   3 +-
 .../admin/controllers/admin-web-hooks.js.es6  |   3 +-
 .../admin/controllers/admin.js.es6            |   3 +-
 .../modals/admin-add-upload.js.es6            |   3 +-
 .../modals/admin-badge-preview.js.es6         |   3 +-
 .../admin-color-scheme-select-base.js.es6     |   3 +-
 .../modals/admin-edit-badge-groupings.js.es6  |   3 +-
 .../modals/admin-incoming-email.js.es6        |   3 +-
 .../modals/admin-install-theme.js.es6         |   3 +-
 .../controllers/modals/admin-reseed.js.es6    |   3 +-
 .../modals/admin-silence-user.js.es6          |   3 +-
 .../admin-staff-action-log-details.js.es6     |   3 +-
 .../modals/admin-start-backup.js.es6          |   3 +-
 .../modals/admin-suspend-user.js.es6          |   3 +-
 .../modals/admin-theme-change.js.es6          |   3 +-
 .../modals/admin-uploaded-image-list.js.es6   |   3 +-
 .../modals/admin-watched-word-test.js.es6     |   3 +-
 .../site-setting-default-categories.js.es6    |   3 +-
 .../discourse/controllers/about.js.es6        |   3 +-
 .../account-created-edit-email.js.es6         |   3 +-
 .../controllers/account-created-index.js.es6  |   3 +-
 .../controllers/activation-edit.js.es6        |   3 +-
 .../controllers/add-post-notice.js.es6        |   3 +-
 .../discourse/controllers/application.js.es6  |   3 +-
 .../associate-account-confirm.js.es6          |   3 +-
 .../discourse/controllers/auth-token.js.es6   |   3 +-
 .../controllers/avatar-selector.js.es6        |   3 +-
 .../discourse/controllers/badges/index.js.es6 |   3 +-
 .../discourse/controllers/badges/show.js.es6  |   3 +-
 .../controllers/basic-modal-body.js.es6       |   3 +-
 .../bulk-notification-level.js.es6            |   3 +-
 .../discourse/controllers/change-owner.js.es6 |   3 +-
 .../controllers/change-timestamp.js.es6       |   3 +-
 .../discourse/controllers/composer.js.es6     |   3 +-
 .../convert-to-public-topic.js.es6            |   3 +-
 .../controllers/create-account.js.es6         |   3 +-
 .../controllers/discovery-sortable.js.es6     |   3 +-
 .../discourse/controllers/discovery.js.es6    |   3 +-
 .../controllers/edit-category.js.es6          |   3 +-
 .../controllers/edit-topic-timer.js.es6       |   3 +-
 .../discourse/controllers/email-login.js.es6  |   3 +-
 .../discourse/controllers/exception.js.es6    |   3 +-
 .../controllers/explain-reviewable.js.es6     |   3 +-
 .../controllers/feature-topic.js.es6          |   3 +-
 .../discourse/controllers/flag.js.es6         |   3 +-
 .../controllers/forgot-password.js.es6        |   3 +-
 .../controllers/full-page-search.js.es6       |   3 +-
 .../discourse/controllers/grant-badge.js.es6  | 127 +++--
 .../controllers/group-activity-posts.js.es6   |   3 +-
 .../controllers/group-activity-topics.js.es6  |   3 +-
 .../controllers/group-activity.js.es6         |   3 +-
 .../controllers/group-add-members.js.es6      |   3 +-
 .../controllers/group-bulk-add.js.es6         |   3 +-
 .../discourse/controllers/group-index.js.es6  |   3 +-
 .../controllers/group-manage-logs.js.es6      |   3 +-
 .../controllers/group-manage-profile.js.es6   |   3 +-
 .../discourse/controllers/group-manage.js.es6 |   3 +-
 .../controllers/group-messages.js.es6         |   3 +-
 .../controllers/group-requests.js.es6         |   3 +-
 .../discourse/controllers/group.js.es6        |   3 +-
 .../discourse/controllers/groups-index.js.es6 |   3 +-
 .../discourse/controllers/groups-new.js.es6   |   3 +-
 .../discourse/controllers/history.js.es6      |   3 +-
 .../ignore-duration-with-username.js.es6      |   3 +-
 .../controllers/ignore-duration.js.es6        |   3 +-
 .../controllers/insert-hyperlink.js.es6       |   3 +-
 .../discourse/controllers/invites-show.js.es6 |   3 +-
 .../discourse/controllers/jump-to-post.js.es6 |   3 +-
 .../keyboard-shortcuts-help.js.es6            |   3 +-
 .../discourse/controllers/login.js.es6        |   3 +-
 .../discourse/controllers/modal.js.es6        |   3 +-
 .../controllers/move-to-topic.js.es6          |   3 +-
 .../controllers/navigation/default.js.es6     |   3 +-
 .../controllers/not-activated.js.es6          |   3 +-
 .../controllers/password-reset.js.es6         |   3 +-
 .../discourse/controllers/preferences.js.es6  |   3 +-
 .../controllers/preferences/about.js.es6      |   3 +-
 .../controllers/preferences/account.js.es6    | 446 +++++++++---------
 .../controllers/preferences/categories.js.es6 |   3 +-
 .../controllers/preferences/email.js.es6      |   3 +-
 .../controllers/preferences/emails.js.es6     |   3 +-
 .../controllers/preferences/interface.js.es6  |   3 +-
 .../preferences/notifications.js.es6          |   3 +-
 .../controllers/preferences/profile.js.es6    |   3 +-
 .../preferences/second-factor.js.es6          |   3 +-
 .../controllers/preferences/tags.js.es6       |   3 +-
 .../controllers/preferences/username.js.es6   |   3 +-
 .../controllers/preferences/users.js.es6      |   3 +-
 .../discourse/controllers/raw-email.js.es6    |   3 +-
 .../discourse/controllers/rename-tag.js.es6   |   3 +-
 .../controllers/reorder-categories.js.es6     |   3 +-
 .../request-group-membership-form.js.es6      |   3 +-
 .../discourse/controllers/review-index.js.es6 |   3 +-
 .../controllers/review-settings.js.es6        |   3 +-
 .../discourse/controllers/search-help.js.es6  |   3 +-
 .../second-factor-add-security-key.js.es6     |   3 +-
 .../controllers/second-factor-add-totp.js.es6 |   3 +-
 .../second-factor-backup-edit.js.es6          |   3 +-
 .../second-factor-edit-security-key.js.es6    |   3 +-
 .../controllers/second-factor-edit.js.es6     |   3 +-
 .../discourse/controllers/static.js.es6       |   3 +-
 .../controllers/tag-groups-show.js.es6        |   3 +-
 .../discourse/controllers/tag-groups.js.es6   |   3 +-
 .../discourse/controllers/tags-index.js.es6   |   3 +-
 .../discourse/controllers/tags-show.js.es6    |   3 +-
 .../controllers/topic-bulk-actions.js.es6     |   3 +-
 .../discourse/controllers/topic.js.es6        |   3 +-
 .../controllers/upload-selector.js.es6        |   3 +-
 .../controllers/user-activity.js.es6          |   3 +-
 .../discourse/controllers/user-badges.js.es6  |   3 +-
 .../discourse/controllers/user-card.js.es6    |   3 +-
 .../controllers/user-invited-show.js.es6      |   3 +-
 .../controllers/user-notifications.js.es6     |   3 +-
 .../discourse/controllers/user-posts.js.es6   |   3 +-
 .../user-private-messages-tags.js.es6         |   3 +-
 .../controllers/user-private-messages.js.es6  |   3 +-
 .../discourse/controllers/user-summary.js.es6 |   3 +-
 .../controllers/user-topics-list.js.es6       |   3 +-
 .../discourse/controllers/user.js.es6         |   3 +-
 .../discourse/controllers/users.js.es6        |   3 +-
 .../wizard/controllers/application.js.es6     |   3 +-
 .../wizard/controllers/step.js.es6            |   3 +-
 .../controllers/controller-index.js.es6.erb   |   3 +-
 .../controllers/controller-show.js.es6.erb    |   3 +-
 .../controllers/controller.js.es6.erb         |   3 +-
 .../controllers/poll-ui-builder.js.es6        |   3 +-
 .../mixins/grant-badge-controller-test.js.es6 |   5 +-
 172 files changed, 623 insertions(+), 462 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 684f844bc5..b71a45c57d 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { setting, i18n } from "discourse/lib/computed";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   adminBackups: Ember.inject.controller(),
   status: Ember.computed.alias("adminBackups.model"),
   uploadLabel: i18n("admin.backups.upload.label"),
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 40bad8ae00..4887c779e6 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   adminBackups: Ember.inject.controller(),
   status: Ember.computed.alias("adminBackups.model"),
 
diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js.es6
index 5cfa57271e..d697ae7288 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   noOperationIsRunning: Ember.computed.not("model.isOperationRunning"),
   rollbackEnabled: Ember.computed.and(
     "model.canRollback",
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 1f7382f54b..254f9918f5 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,9 +1,10 @@
+import 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 computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(bufferedProperty("model"), {
+export default Controller.extend(bufferedProperty("model"), {
   adminBadges: Ember.inject.controller(),
   saving: false,
   savingStatus: "",
diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges.js.es6
index 77c79b724a..cf6c4e3aa2 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges.js.es6
@@ -1 +1,2 @@
-export default Ember.Controller.extend();
+import Controller from "@ember/controller";
+export default Controller.extend();
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.es6
index 3fbdb989cf..df5d71d3de 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.colors", "onlyOverridden")
   colors(allColors, onlyOverridden) {
     if (onlyOverridden) {
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 7a9be8cc5d..9dad0098f1 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.@each.id")
   baseColorScheme() {
     return this.model.findBy("is_base", true);
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.es6
index b8054c8bc3..f48f46eff0 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.isSaving")
   saveButtonText(isSaving) {
     return isSaving ? I18n.t("saving") : I18n.t("admin.customize.save");
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.es6
index 68a78a7d7f..5ec405594a 100644
--- 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.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(bufferedProperty("emailTemplate"), {
+export default Controller.extend(bufferedProperty("emailTemplate"), {
   saved: false,
 
   @computed("buffered.body", "buffered.subject")
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.es6
index 8631babc67..253641fc12 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   emailTemplates: null,
   sortedTemplates: Ember.computed.sort("emailTemplates", "titleSorting"),
 
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.es6
index 9cb38c75ea..61b0b6269b 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Ember.Controller.extend(bufferedProperty("model"), {
+export default Controller.extend(bufferedProperty("model"), {
   saved: false,
   isSaving: false,
   saveDisabled: propertyEqual("model.robots_txt", "buffered.robots_txt"),
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.es6
index ba54e3c91f..a5a286bf80 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { url } from "discourse/lib/computed";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   section: null,
   currentTarget: 0,
   maximized: false,
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.es6
index fc211ce628..6b9c26601f 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { url } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import { THEMES, COMPONENTS } from "admin/models/theme";
 
 const THEME_UPLOAD_VAR = 2;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   downloadUrl: url("model.id", "/admin/customize/themes/%@/export"),
   previewUrl: url("model.id", "/admin/themes/%@/preview"),
   addButtonDisabled: Ember.computed.empty("selectedChildThemeId"),
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
index f38ae3ab74..6727df97f3 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { THEMES } from "admin/models/theme";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   currentTab: THEMES,
 
   @computed("model", "model.@each.component")
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
index eb85ef4a41..54916ed715 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import AdminDashboard from "admin/models/admin-dashboard";
@@ -12,7 +13,7 @@ function staticReport(reportType) {
   });
 }
 
-export default Ember.Controller.extend(PeriodComputationMixin, {
+export default Controller.extend(PeriodComputationMixin, {
   isLoading: false,
   dashboardFetchedAt: null,
   exceptionController: Ember.inject.controller("exception"),
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6
index df06e682f4..e5d8dae25a 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PeriodComputationMixin from "admin/mixins/period-computation";
 
-export default Ember.Controller.extend(PeriodComputationMixin, {
+export default Controller.extend(PeriodComputationMixin, {
   @computed
   flagsStatusOptions() {
     return {
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 9c2eccdab1..12cc0400f1 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 const { get } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   filter: null,
 
   @computed("model.[]", "filter")
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 0ff4b540d1..53a97a6304 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import AdminDashboard from "admin/models/admin-dashboard";
@@ -5,7 +6,7 @@ import VersionCheck from "admin/models/version-check";
 
 const PROBLEMS_CHECK_MINUTES = 1;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   isLoading: false,
   dashboardFetchedAt: null,
   exceptionController: Ember.inject.controller("exception"),
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.es6
index c98fb7cfb9..8443344349 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   email: null,
   text: null,
   elided: null,
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
index 02860948c0..586c911c3c 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
@@ -1,5 +1,6 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-export default Ember.Controller.extend({
+export default Controller.extend({
   /**
     Is the "send test email" button disabled?
 
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
index c7c2df8c95..49a84ea6d1 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import EmailLog from "admin/models/email-log";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
 
   loadLogs(sourceModel, loadMore) {
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.es6
index 407478d681..648891b545 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   username: null,
   lastSeen: null,
 
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
index a8b522130c..7e185e9d12 100644
--- a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   saved: false,
   embedding: null,
 
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
index d110904338..6bde3d29d8 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
@@ -1,5 +1,6 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-export default Ember.Controller.extend({
+export default Controller.extend({
   sortedEmojis: Ember.computed.sort("model", "emojiSorting"),
 
   init() {
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.es6
index 2a410f7705..5b0908c363 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import ScreenedEmail from "admin/models/screened-email";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
 
   actions: {
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 66ffe3c08c..2e404eb29d 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
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import { outputExportResult } from "discourse/lib/export-result";
 import { exportEntity } from "discourse/lib/export-csv";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   filter: null,
   savedIpAddress: null,
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.es6
index ef01562302..3f33783184 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import ScreenedUrl from "admin/models/screened-url";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
 
   show() {
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.es6
index a3d332c1f5..e06ad2cbeb 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import {
@@ -5,7 +6,7 @@ import {
   on
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   model: null,
   filters: null,
   filtersExists: Ember.computed.gt("filterCount", 0),
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
index 45e88514a0..d024c83051 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import Permalink from "admin/models/permalink";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   filter: null,
 
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
index 36b1f7ca11..c0322317e5 100644
--- a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed
   adminRoutes: function() {
     return this.model
diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
index 2a78ece7f4..359be15f1d 100644
--- a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["start_date", "end_date", "filters"],
   start_date: null,
   end_date: null,
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.es6
index 5c26cb0e9f..397b4c9b9e 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 export const DEFAULT_PERIOD = "yearly";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   period: DEFAULT_PERIOD,
   searchType: "all",
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.es6
index 229aa67db8..66def62c97 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   term: null,
   period: DEFAULT_PERIOD,
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 a5831299ec..7d4f33a1ac 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,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   categoryNameKey: null,
   adminSiteSettings: Ember.inject.controller(),
 
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 09a335946d..c2ae8d5a56 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   filter: null,
   allSiteSettings: Ember.computed.alias("model"),
   visibleSiteSettings: null,
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.es6
index 4aa1c3d428..cd815b9ae8 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(bufferedProperty("siteText"), {
+export default Controller.extend(bufferedProperty("siteText"), {
   saved: false,
 
   @computed("buffered.value")
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.es6
index 1c484e4287..15a16be72b 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 let lastSearch;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   searching: false,
   siteTexts: null,
   preferred: false,
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 d419cf9e34..36dbf57f8d 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(GrantBadgeController, {
+export default Controller.extend(GrantBadgeController, {
   adminUser: Ember.inject.controller(),
   user: Ember.computed.alias("adminUser.model"),
   userBadges: Ember.computed.alias("model"),
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
index 7d2a6b3d56..c2c6e9d5fc 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const MAX_FIELDS = 20;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   fieldTypes: null,
   createDisabled: Ember.computed.gte("model.length", MAX_FIELDS),
   sortedFields: Ember.computed.sort("model", "fieldSortOrder"),
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 4a24bbd4b5..e086d85374 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
@@ -6,7 +7,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Controller.extend(CanCheckEmails, {
+export default Controller.extend(CanCheckEmails, {
   adminTools: Ember.inject.service(),
   originalPrimaryGroupId: null,
   customGroupIdsBuffer: null,
diff --git a/app/assets/javascripts/admin/controllers/admin-user.js.es6 b/app/assets/javascripts/admin/controllers/admin-user.js.es6
index 77c79b724a..cf6c4e3aa2 100644
--- a/app/assets/javascripts/admin/controllers/admin-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user.js.es6
@@ -1 +1,2 @@
-export default Ember.Controller.extend();
+import Controller from "@ember/controller";
+export default Controller.extend();
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 743e68d24b..944b0d9485 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
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import debounce 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 computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(CanCheckEmails, {
+export default Controller.extend(CanCheckEmails, {
   model: null,
   query: null,
   order: null,
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 cf4a28e2d3..632f84ec60 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,10 +1,11 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 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 Ember.Controller.extend({
+export default Controller.extend({
   actionNameKey: null,
   adminWatchedWords: Ember.inject.controller(),
   showWordsList: Ember.computed.or(
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 20ed611781..6d064301f3 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   filter: null,
   filtered: false,
   showWords: false,
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.es6
index 388fab304f..1f10fa3e08 100644
--- 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.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   pingDisabled: false,
   incomingCount: Ember.computed.alias("incomingEventIds.length"),
 
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 2a637d7278..2409e7c7db 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,9 +1,10 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
 import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   adminWebHooks: Ember.inject.controller(),
   eventTypes: Ember.computed.alias("adminWebHooks.eventTypes"),
   defaultEventTypes: Ember.computed.alias("adminWebHooks.defaultEventTypes"),
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
index 696541c1cf..f9f401e330 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     destroy(webhook) {
       return bootbox.confirm(
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index a79cf81944..52ecf0a70b 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   router: Ember.inject.service(),
 
   @computed("siteSettings.enable_group_directory")
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 73f1f1e11f..daad10549e 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,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -52,7 +53,7 @@ const SCSS_VARIABLE_NAMES = [
   "love-low"
 ];
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminCustomizeThemesShow: Ember.inject.controller(),
 
   uploadUrl: "/admin/themes/upload_asset",
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.es6
index 045a96c2aa..bf58496ed7 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   sample: Ember.computed.alias("model.sample"),
   errors: Ember.computed.alias("model.errors"),
   count: Ember.computed.alias("model.grant_count"),
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 374b6392f4..80f57d9a18 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,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminCustomizeColors: Ember.inject.controller(),
 
   actions: {
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 76dc4c07d7..4d0c66143c 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,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @observes("model")
   modelChanged() {
     const model = this.model;
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.es6
index e19afcd359..210d664cda 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import IncomingEmail from "admin/models/incoming-email";
 import computed from "ember-addons/ember-computed-decorators";
 import { longDate } from "discourse/lib/formatter";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed("model.date")
   date(d) {
     return longDate(d);
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 a81e8caef7..84cccd52ae 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,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -10,7 +11,7 @@ import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 
 const MIN_NAME_LENGTH = 4;
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   popular: Ember.computed.equal("selection", "popular"),
   local: Ember.computed.equal("selection", "local"),
   remote: Ember.computed.equal("selection", "remote"),
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6
index f71c7eaf2e..176c46be36 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: true,
   reseeding: false,
   categories: null,
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.es6
index 79ec3e6945..15aa4a2806 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PenaltyController from "admin/mixins/penalty-controller";
 
-export default Ember.Controller.extend(PenaltyController, {
+export default Controller.extend(PenaltyController, {
   silenceUntil: null,
   silencing: false,
 
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.es6
index 23420631f0..06110e0113 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality);
+export default Controller.extend(ModalFunctionality);
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 7bd96b326a..9a321c2348 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,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminBackupsLogs: Ember.inject.controller(),
 
   actions: {
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.es6
index c5911322c5..18a9e42e58 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PenaltyController from "admin/mixins/penalty-controller";
 
-export default Ember.Controller.extend(PenaltyController, {
+export default Controller.extend(PenaltyController, {
   suspendUntil: null,
   suspending: false,
 
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.es6
index 834376a2d6..e33284d233 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loadDiff() {
     this.set("loading", true);
     ajax(
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.es6
index 22aa327651..a5ac891c21 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @on("init")
   @observes("model.value")
   _setup() {
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.es6
index 7af6650ca6..10f90ee615 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed("value", "model.compiledRegularExpression")
   matches(value, regexpString) {
     if (!value || !regexpString) return;
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.es6
index 5b856f1dbc..62e77ed8e6 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("updateExistingUsers", null);
   },
diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js.es6
index f17aac609b..d238d976ef 100644
--- a/app/assets/javascripts/discourse/controllers/about.js.es6
+++ b/app/assets/javascripts/discourse/controllers/about.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   faqOverriden: Ember.computed.gt("siteSettings.faq_url.length", 0),
 
   @computed
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.es6
index b22fd6de9a..1002a90752 100644
--- a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { changeEmail } from "discourse/lib/user-activation";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   accountCreated: null,
   newEmail: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-index.js.es6
index ed822d3d3b..00d381a080 100644
--- a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/account-created-index.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { resendActivationEmail } from "discourse/lib/user-activation";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     sendActivationEmail() {
       resendActivationEmail(this.get("accountCreated.username")).then(() => {
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
index ebe73984d0..c44c25ca1f 100644
--- a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { extractError } from "discourse/lib/ajax-error";
 import { changeEmail } from "discourse/lib/user-activation";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   login: Ember.inject.controller(),
 
   currentEmail: null,
diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6 b/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
index 13c3927d4a..ef05db0d67 100644
--- a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
+++ b/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
 import { cookAsync } from "discourse/lib/text";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   post: null,
   resolve: null,
   reject: null,
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index 7cd2898bf1..e0a5d5c90a 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   showTop: true,
   showFooter: false,
   router: Ember.inject.service(),
diff --git a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6 b/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6
index e9685e0cf9..e138dc71db 100644
--- a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6
+++ b/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   actions: {
     finishConnect() {
       ajax({
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
index 1d933fb191..0a02adf223 100644
--- a/app/assets/javascripts/discourse/controllers/auth-token.js.es6
+++ b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   expanded: false,
 
   onShow() {
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index 624eb3ab22..1a23033580 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/utilities";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed(
     "selected",
     "user.system_avatar_upload_id",
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js.es6 b/app/assets/javascripts/discourse/controllers/badges/index.js.es6
index eb36dbe521..c1c4d8db27 100644
--- a/app/assets/javascripts/discourse/controllers/badges/index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/index.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model")
   badgeGroups(model) {
     var sorted = _.sortBy(model, function(badge) {
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index def520016e..3de5ac6cb0 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 import {
@@ -5,7 +6,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,
diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 b/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
index 1ee99a7549..03d95d5cb2 100644
--- a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
@@ -1,5 +1,6 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   modal: null
 });
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 f34195bf8a..fe4c255645 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
-export default Ember.Controller.extend({
+export default Controller.extend({
   topicBulkActions: Ember.inject.controller(),
   notificationLevelId: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 0738db8740..40fa8bc15b 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicController: Ember.inject.controller("topic"),
 
   saving: false,
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 6d64eb32e8..cd02a1a32b 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
 import Topic from "discourse/models/topic";
 
 // Modal related to changing the timestamp of posts
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicController: Ember.inject.controller("topic"),
   saving: false,
   date: "",
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 595568eec2..e2bdfadc04 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import Quote from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
@@ -74,7 +75,7 @@ export function addPopupMenuOptionsCallback(callback) {
   _popupMenuOptionsCallbacks.push(callback);
 }
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   topicController: Ember.inject.controller("topic"),
   router: Ember.inject.service(),
 
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.es6
index 58ccfbcf88..2c08ff7884 100644
--- a/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   publicCategoryId: null,
   saving: true,
 
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index eb370191e9..42d3c40147 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 Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { setting } from "discourse/lib/computed";
@@ -14,7 +15,7 @@ import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import { userPath } from "discourse/lib/url";
 import { findAll } from "discourse/models/login-method";
 
-export default Ember.Controller.extend(
+export default Controller.extend(
   ModalFunctionality,
   PasswordValidation,
   UsernameValidation,
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index 4ce4284c55..abe0e3795e 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import DiscourseNavigation from "discourse/components/d-navigation";
 
 // Just add query params here to have them automatically passed to topic list filters.
@@ -25,7 +26,7 @@ controllerOpts.queryParams.forEach(
   p => (controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`))
 );
 
-const Controller = Ember.Controller.extend(controllerOpts);
+const Controller = Controller.extend(controllerOpts);
 
 export const addDiscoveryQueryParam = function(p, opts) {
   queryParams[p] = opts;
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 858058e4b0..075b47ee60 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   discoveryTopics: Ember.inject.controller("discovery/topics"),
   navigationCategory: Ember.inject.controller("navigation/category"),
   application: Ember.inject.controller(),
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index 381292baaa..6b2e99844f 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import { extractError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   selectedTab: null,
   saving: false,
   deleting: false,
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 d90ca5cbd4..a0562e655a 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
@@ -10,7 +11,7 @@ export const DELETE_STATUS_TYPE = "delete";
 export const REMINDER_TYPE = "reminder";
 export const BUMP_TYPE = "bump";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   isPublic: "true",
 
diff --git a/app/assets/javascripts/discourse/controllers/email-login.js.es6 b/app/assets/javascripts/discourse/controllers/email-login.js.es6
index d062144afe..78ab74f239 100644
--- a/app/assets/javascripts/discourse/controllers/email-login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/email-login.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
@@ -5,7 +6,7 @@ import DiscourseURL from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   lockImageUrl: Discourse.getURL("/images/lock.svg"),
 
   @computed("model")
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 6b341b155a..7b8a1bec8f 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import {
   on,
   default as computed
@@ -26,7 +27,7 @@ const ButtonBackBright = {
   };
 
 // The controller for the nice error page
-export default Ember.Controller.extend({
+export default Controller.extend({
   thrown: null,
   lastTransition: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6 b/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6
index 49e57228a6..268958e105 100644
--- a/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: null,
   reviewableExplanation: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index 9709b21c48..231b3cac08 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicController: Ember.inject.controller("topic"),
 
   loading: true,
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index bcfbb5e325..99dee423d2 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import ActionSummary from "discourse/models/action-summary";
 import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
@@ -5,7 +6,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminTools: optionalService(),
   userDetails: null,
   selected: null,
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index 288ffa8ba8..7f12df2e28 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { escapeExpression } from "discourse/lib/utilities";
 import { extractError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   offerHelp: null,
   helpSeen: false,
 
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 29b7093007..bfe34bea92 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
   translateResults,
@@ -24,7 +25,7 @@ const SortOrders = [
 ];
 const PAGE_LIMIT = 10;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
   composer: Ember.inject.controller(),
   bulkSelectEnabled: null,
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
index 13757e678e..2313ae5d3f 100644
--- a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -5,82 +6,78 @@ import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 
-export default Ember.Controller.extend(
-  ModalFunctionality,
-  GrantBadgeController,
-  {
-    topicController: Ember.inject.controller("topic"),
-    loading: true,
-    saving: false,
-    selectedBadgeId: null,
+export default Controller.extend(ModalFunctionality, GrantBadgeController, {
+  topicController: Ember.inject.controller("topic"),
+  loading: true,
+  saving: false,
+  selectedBadgeId: null,
 
-    init() {
-      this._super(...arguments);
+  init() {
+    this._super(...arguments);
 
-      this.allBadges = [];
-      this.userBadges = [];
-    },
+    this.allBadges = [];
+    this.userBadges = [];
+  },
 
-    @computed("topicController.selectedPosts")
-    post() {
-      return this.get("topicController.selectedPosts")[0];
-    },
+  @computed("topicController.selectedPosts")
+  post() {
+    return this.get("topicController.selectedPosts")[0];
+  },
 
-    @computed("post")
-    badgeReason(post) {
-      const url = post.get("url");
-      const protocolAndHost =
-        window.location.protocol + "//" + window.location.host;
+  @computed("post")
+  badgeReason(post) {
+    const url = post.get("url");
+    const protocolAndHost =
+      window.location.protocol + "//" + window.location.host;
 
-      return url.indexOf("/") === 0 ? protocolAndHost + url : url;
-    },
+    return url.indexOf("/") === 0 ? protocolAndHost + url : url;
+  },
 
-    @computed("saving", "selectedBadgeGrantable")
-    buttonDisabled(saving, selectedBadgeGrantable) {
-      return saving || !selectedBadgeGrantable;
-    },
+  @computed("saving", "selectedBadgeGrantable")
+  buttonDisabled(saving, selectedBadgeGrantable) {
+    return saving || !selectedBadgeGrantable;
+  },
 
-    onShow() {
-      this.set("loading", true);
+  onShow() {
+    this.set("loading", true);
 
-      Ember.RSVP.all([
-        Badge.findAll(),
-        UserBadge.findByUsername(this.get("post.username"))
-      ]).then(([allBadges, userBadges]) => {
-        this.setProperties({
-          allBadges: allBadges,
-          userBadges: userBadges,
-          loading: false
-        });
+    Ember.RSVP.all([
+      Badge.findAll(),
+      UserBadge.findByUsername(this.get("post.username"))
+    ]).then(([allBadges, userBadges]) => {
+      this.setProperties({
+        allBadges: allBadges,
+        userBadges: userBadges,
+        loading: false
       });
-    },
+    });
+  },
 
-    actions: {
-      grantBadge() {
-        this.set("saving", true);
+  actions: {
+    grantBadge() {
+      this.set("saving", true);
 
-        this.grantBadge(
-          this.selectedBadgeId,
-          this.get("post.username"),
-          this.badgeReason
+      this.grantBadge(
+        this.selectedBadgeId,
+        this.get("post.username"),
+        this.badgeReason
+      )
+        .then(
+          newBadge => {
+            this.set("selectedBadgeId", null);
+            this.flash(
+              I18n.t("badges.successfully_granted", {
+                username: this.get("post.username"),
+                badge: newBadge.get("badge.name")
+              }),
+              "success"
+            );
+          },
+          error => {
+            this.flash(extractError(error), "error");
+          }
         )
-          .then(
-            newBadge => {
-              this.set("selectedBadgeId", null);
-              this.flash(
-                I18n.t("badges.successfully_granted", {
-                  username: this.get("post.username"),
-                  badge: newBadge.get("badge.name")
-                }),
-                "success"
-              );
-            },
-            error => {
-              this.flash(extractError(error), "error");
-            }
-          )
-          .finally(() => this.set("saving", false));
-      }
+        .finally(() => this.set("saving", 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 3e4454ce0e..32c284f3e2 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   group: Ember.inject.controller(),
   groupActivity: Ember.inject.controller(),
   application: Ember.inject.controller(),
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
index 2a559a196c..6d922b754e 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   actions: {
     loadMore() {
       this.model.loadMore();
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index 26fa94835a..838045d206 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   router: Ember.inject.service(),
   queryParams: ["category_id"]
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
index 6e478fe3d8..d3bf4a3ea5 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   setAsOwner: false,
 
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
index 716347d4c6..4a4323d611 100644
--- a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
 
   @computed("input", "loading", "result")
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index 690997aa54..7dad9329d1 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
 import {
@@ -6,7 +7,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["order", "desc", "filter"],
   order: "",
   desc: null,
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 22ee01cff5..87b0a01ecf 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   group: Ember.inject.controller(),
   loading: false,
   offset: 0,
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
index e316e97fad..719745dfa3 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   saving: null
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
index 795627c3cb..662887935a 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   router: Ember.inject.service(),
 
   @computed("model.automatic")
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
index cda126a2e2..4cecbd3701 100644
--- a/app/assets/javascripts/discourse/controllers/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   router: Ember.inject.service()
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
index 178db75758..3c29622ea9 100644
--- a/app/assets/javascripts/discourse/controllers/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
@@ -7,7 +8,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["order", "desc", "filter"],
   order: "",
   desc: null,
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index f6a44552aa..d555c7c161 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 const Tab = Ember.Object.extend({
@@ -9,7 +10,7 @@ const Tab = Ember.Object.extend({
   }
 });
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
   counts: null,
   showing: "members",
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
index 1c6a824ded..a689dfa7bd 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
   queryParams: ["order", "asc", "filter", "type"],
   order: null,
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
index 293beffd53..f93c08959d 100644
--- a/app/assets/javascripts/discourse/controllers/groups-new.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   saving: null,
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index 53627c157f..8b139e19b7 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import computed from "ember-addons/ember-computed-decorators";
@@ -20,7 +21,7 @@ function customTagArray(fieldName) {
 }
 
 // This controller handles displaying of history
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: true,
   viewMode: "side_by_side",
 
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.es6
index 6ba026a1b8..491c496df7 100644
--- a/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import User from "discourse/models/user";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   ignoredUntil: null,
   ignoredUsername: null,
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6
index 574f69e373..c78b73cbb3 100644
--- a/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6
+++ b/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   ignoredUntil: null,
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index 82d3a7250b..e1d714be39 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   _debounced: null,
   _activeSearch: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index 2664a95bd7..98d5fd5496 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import getUrl from "discourse-common/lib/get-url";
 import DiscourseURL from "discourse/lib/url";
@@ -8,7 +9,7 @@ import NameValidation from "discourse/mixins/name-validation";
 import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import { findAll as findLoginMethods } from "discourse/models/login-method";
 
-export default Ember.Controller.extend(
+export default Controller.extend(
   PasswordValidation,
   UsernameValidation,
   NameValidation,
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index 385db0406f..af6fd216f5 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   model: null,
   postNumber: null,
   postDate: null,
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 9520e6c8f8..9e1c216e13 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 const KEY = "keyboard_shortcuts_help";
@@ -46,7 +47,7 @@ function buildShortcut(
   return I18n.t(`${KEY}.${key}`, context);
 }
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
   },
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 7f0f5bdd33..feaffe8fdf 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import showModal from "discourse/lib/show-modal";
@@ -19,7 +20,7 @@ const AuthErrors = [
   "not_allowed_from_ip_address"
 ];
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   createAccount: Ember.inject.controller(),
   forgotPassword: Ember.inject.controller(),
   application: Ember.inject.controller(),
diff --git a/app/assets/javascripts/discourse/controllers/modal.js.es6 b/app/assets/javascripts/discourse/controllers/modal.js.es6
index 77c79b724a..cf6c4e3aa2 100644
--- a/app/assets/javascripts/discourse/controllers/modal.js.es6
+++ b/app/assets/javascripts/discourse/controllers/modal.js.es6
@@ -1 +1,2 @@
-export default Ember.Controller.extend();
+import Controller from "@ember/controller";
+export default Controller.extend();
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index fa41654818..195dc93322 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { movePosts, mergeTopic } from "discourse/models/topic";
 import DiscourseURL from "discourse/lib/url";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicName: null,
   saving: false,
   categoryId: null,
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 0ad1878622..036f4174a2 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   discovery: Ember.inject.controller(),
   discoveryTopics: Ember.inject.controller("discovery/topics"),
 
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js.es6
index 71824b3e15..ba520eb6f2 100644
--- a/app/assets/javascripts/discourse/controllers/not-activated.js.es6
+++ b/app/assets/javascripts/discourse/controllers/not-activated.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { resendActivationEmail } from "discourse/lib/user-activation";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   actions: {
     sendActivationEmail() {
       resendActivationEmail(this.username).then(() => {
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
index 4194d67f16..618e7a3c43 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
 import { ajax } from "discourse/lib/ajax";
@@ -6,7 +7,7 @@ import { userPath } from "discourse/lib/url";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
-export default Ember.Controller.extend(PasswordValidation, {
+export default Controller.extend(PasswordValidation, {
   isDeveloper: Ember.computed.alias("model.is_developer"),
   admin: Ember.computed.alias("model.admin"),
   secondFactorRequired: Ember.computed.alias("model.second_factor_required"),
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index cda126a2e2..4cecbd3701 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -1,3 +1,4 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   router: Ember.inject.service()
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/about.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
index 37e7247a8a..ec9958c1fc 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   saving: false,
   newBio: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 14fcc4b79f..a5b9e098a5 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -12,248 +13,243 @@ import { userPath } from "discourse/lib/url";
 // Number of tokens shown by default.
 const DEFAULT_AUTH_TOKENS_COUNT = 2;
 
-export default Ember.Controller.extend(
-  CanCheckEmails,
-  PreferencesTabController,
-  {
-    init() {
-      this._super(...arguments);
+export default Controller.extend(CanCheckEmails, PreferencesTabController, {
+  init() {
+    this._super(...arguments);
 
-      this.saveAttrNames = ["name", "title"];
-      this.set("revoking", {});
-    },
+    this.saveAttrNames = ["name", "title"];
+    this.set("revoking", {});
+  },
 
-    canEditName: setting("enable_names"),
-    canSaveUser: true,
+  canEditName: setting("enable_names"),
+  canSaveUser: true,
 
-    newNameInput: null,
-    newTitleInput: null,
+  newNameInput: null,
+  newTitleInput: null,
 
-    passwordProgress: null,
+  passwordProgress: null,
 
-    showAllAuthTokens: false,
+  showAllAuthTokens: false,
 
-    revoking: null,
+  revoking: null,
 
-    cannotDeleteAccount: Ember.computed.not("currentUser.can_delete_account"),
-    deleteDisabled: Ember.computed.or(
-      "model.isSaving",
-      "deleting",
-      "cannotDeleteAccount"
-    ),
+  cannotDeleteAccount: Ember.computed.not("currentUser.can_delete_account"),
+  deleteDisabled: Ember.computed.or(
+    "model.isSaving",
+    "deleting",
+    "cannotDeleteAccount"
+  ),
 
-    reset() {
-      this.set("passwordProgress", null);
-    },
+  reset() {
+    this.set("passwordProgress", null);
+  },
 
-    @computed()
-    nameInstructions() {
-      return I18n.t(
-        this.siteSettings.full_name_required
-          ? "user.name.instructions_required"
-          : "user.name.instructions"
+  @computed()
+  nameInstructions() {
+    return I18n.t(
+      this.siteSettings.full_name_required
+        ? "user.name.instructions_required"
+        : "user.name.instructions"
+    );
+  },
+
+  canSelectTitle: Ember.computed.gt("model.availableTitles.length", 0),
+
+  @computed("model.is_anonymous")
+  canChangePassword(isAnonymous) {
+    if (isAnonymous) {
+      return false;
+    } else {
+      return (
+        !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins
       );
-    },
+    }
+  },
 
-    canSelectTitle: Ember.computed.gt("model.availableTitles.length", 0),
+  @computed("model.associated_accounts")
+  associatedAccountsLoaded(associatedAccounts) {
+    return typeof associatedAccounts !== "undefined";
+  },
 
-    @computed("model.is_anonymous")
-    canChangePassword(isAnonymous) {
-      if (isAnonymous) {
-        return false;
+  @computed("model.associated_accounts.[]")
+  authProviders(accounts) {
+    const allMethods = findAll();
+
+    const result = allMethods.map(method => {
+      return {
+        method,
+        account: accounts.find(account => account.name === method.name) // Will be undefined if no account
+      };
+    });
+
+    return result.filter(value => value.account || value.method.can_connect);
+  },
+
+  disableConnectButtons: propertyNotEqual("model.id", "currentUser.id"),
+
+  @computed(
+    "model.second_factor_enabled",
+    "canCheckEmails",
+    "model.is_anonymous"
+  )
+  canUpdateAssociatedAccounts(
+    secondFactorEnabled,
+    canCheckEmails,
+    isAnonymous
+  ) {
+    if (secondFactorEnabled || !canCheckEmails || isAnonymous) {
+      return false;
+    }
+    return findAll().length > 0;
+  },
+
+  @computed("showAllAuthTokens", "model.user_auth_tokens")
+  authTokens(showAllAuthTokens, tokens) {
+    tokens.sort((a, b) => {
+      if (a.is_active) {
+        return -1;
+      } else if (b.is_active) {
+        return 1;
       } else {
-        return (
-          !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins
+        return b.seen_at.localeCompare(a.seen_at);
+      }
+    });
+
+    return showAllAuthTokens
+      ? tokens
+      : tokens.slice(0, DEFAULT_AUTH_TOKENS_COUNT);
+  },
+
+  canShowAllAuthTokens: Ember.computed.gt(
+    "model.user_auth_tokens.length",
+    DEFAULT_AUTH_TOKENS_COUNT
+  ),
+
+  actions: {
+    save() {
+      this.set("saved", false);
+
+      this.model.setProperties({
+        name: this.newNameInput,
+        title: this.newTitleInput
+      });
+
+      return this.model
+        .save(this.saveAttrNames)
+        .then(() => this.set("saved", true))
+        .catch(popupAjaxError);
+    },
+
+    changePassword() {
+      if (!this.passwordProgress) {
+        this.set(
+          "passwordProgress",
+          I18n.t("user.change_password.in_progress")
         );
-      }
-    },
-
-    @computed("model.associated_accounts")
-    associatedAccountsLoaded(associatedAccounts) {
-      return typeof associatedAccounts !== "undefined";
-    },
-
-    @computed("model.associated_accounts.[]")
-    authProviders(accounts) {
-      const allMethods = findAll();
-
-      const result = allMethods.map(method => {
-        return {
-          method,
-          account: accounts.find(account => account.name === method.name) // Will be undefined if no account
-        };
-      });
-
-      return result.filter(value => value.account || value.method.can_connect);
-    },
-
-    disableConnectButtons: propertyNotEqual("model.id", "currentUser.id"),
-
-    @computed(
-      "model.second_factor_enabled",
-      "canCheckEmails",
-      "model.is_anonymous"
-    )
-    canUpdateAssociatedAccounts(
-      secondFactorEnabled,
-      canCheckEmails,
-      isAnonymous
-    ) {
-      if (secondFactorEnabled || !canCheckEmails || isAnonymous) {
-        return false;
-      }
-      return findAll().length > 0;
-    },
-
-    @computed("showAllAuthTokens", "model.user_auth_tokens")
-    authTokens(showAllAuthTokens, tokens) {
-      tokens.sort((a, b) => {
-        if (a.is_active) {
-          return -1;
-        } else if (b.is_active) {
-          return 1;
-        } else {
-          return b.seen_at.localeCompare(a.seen_at);
-        }
-      });
-
-      return showAllAuthTokens
-        ? tokens
-        : tokens.slice(0, DEFAULT_AUTH_TOKENS_COUNT);
-    },
-
-    canShowAllAuthTokens: Ember.computed.gt(
-      "model.user_auth_tokens.length",
-      DEFAULT_AUTH_TOKENS_COUNT
-    ),
-
-    actions: {
-      save() {
-        this.set("saved", false);
-
-        this.model.setProperties({
-          name: this.newNameInput,
-          title: this.newTitleInput
-        });
-
         return this.model
-          .save(this.saveAttrNames)
-          .then(() => this.set("saved", true))
-          .catch(popupAjaxError);
-      },
-
-      changePassword() {
-        if (!this.passwordProgress) {
-          this.set(
-            "passwordProgress",
-            I18n.t("user.change_password.in_progress")
-          );
-          return this.model
-            .changePassword()
-            .then(() => {
-              // password changed
-              this.setProperties({
-                changePasswordProgress: false,
-                passwordProgress: I18n.t("user.change_password.success")
-              });
-            })
-            .catch(() => {
-              // password failed to change
-              this.setProperties({
-                changePasswordProgress: false,
-                passwordProgress: I18n.t("user.change_password.error")
-              });
-            });
-        }
-      },
-
-      delete() {
-        this.set("deleting", true);
-        const message = I18n.t("user.delete_account_confirm"),
-          model = this.model,
-          buttons = [
-            {
-              label: I18n.t("cancel"),
-              class: "d-modal-cancel",
-              link: true,
-              callback: () => {
-                this.set("deleting", false);
-              }
-            },
-            {
-              label:
-                iconHTML("exclamation-triangle") +
-                I18n.t("user.delete_account"),
-              class: "btn btn-danger",
-              callback() {
-                model.delete().then(
-                  () => {
-                    bootbox.alert(
-                      I18n.t("user.deleted_yourself"),
-                      () => (window.location = Discourse.getURL("/"))
-                    );
-                  },
-                  () => {
-                    bootbox.alert(I18n.t("user.delete_yourself_not_allowed"));
-                    this.set("deleting", false);
-                  }
-                );
-              }
-            }
-          ];
-        bootbox.dialog(message, buttons, { classes: "delete-account" });
-      },
-
-      revokeAccount(account) {
-        this.set(`revoking.${account.name}`, true);
-
-        this.model
-          .revokeAssociatedAccount(account.name)
-          .then(result => {
-            if (result.success) {
-              this.model.associated_accounts.removeObject(account);
-            } else {
-              bootbox.alert(result.message);
-            }
-          })
-          .catch(popupAjaxError)
-          .finally(() => this.set(`revoking.${account.name}`, false));
-      },
-
-      toggleShowAllAuthTokens() {
-        this.toggleProperty("showAllAuthTokens");
-      },
-
-      revokeAuthToken(token) {
-        ajax(
-          userPath(
-            `${this.get("model.username_lower")}/preferences/revoke-auth-token`
-          ),
-          {
-            type: "POST",
-            data: token ? { token_id: token.id } : {}
-          }
-        )
+          .changePassword()
           .then(() => {
-            if (!token) {
-              const redirect = this.siteSettings.logout_redirect;
-              if (Ember.isEmpty(redirect)) {
-                window.location = Discourse.getURL("/");
-              } else {
-                window.location.href = redirect;
-              }
-            }
+            // password changed
+            this.setProperties({
+              changePasswordProgress: false,
+              passwordProgress: I18n.t("user.change_password.success")
+            });
           })
-          .catch(popupAjaxError);
-      },
-
-      showToken(token) {
-        showModal("auth-token", { model: token });
-      },
-
-      connectAccount(method) {
-        method.doLogin({ reconnect: true });
+          .catch(() => {
+            // password failed to change
+            this.setProperties({
+              changePasswordProgress: false,
+              passwordProgress: I18n.t("user.change_password.error")
+            });
+          });
       }
+    },
+
+    delete() {
+      this.set("deleting", true);
+      const message = I18n.t("user.delete_account_confirm"),
+        model = this.model,
+        buttons = [
+          {
+            label: I18n.t("cancel"),
+            class: "d-modal-cancel",
+            link: true,
+            callback: () => {
+              this.set("deleting", false);
+            }
+          },
+          {
+            label:
+              iconHTML("exclamation-triangle") + I18n.t("user.delete_account"),
+            class: "btn btn-danger",
+            callback() {
+              model.delete().then(
+                () => {
+                  bootbox.alert(
+                    I18n.t("user.deleted_yourself"),
+                    () => (window.location = Discourse.getURL("/"))
+                  );
+                },
+                () => {
+                  bootbox.alert(I18n.t("user.delete_yourself_not_allowed"));
+                  this.set("deleting", false);
+                }
+              );
+            }
+          }
+        ];
+      bootbox.dialog(message, buttons, { classes: "delete-account" });
+    },
+
+    revokeAccount(account) {
+      this.set(`revoking.${account.name}`, true);
+
+      this.model
+        .revokeAssociatedAccount(account.name)
+        .then(result => {
+          if (result.success) {
+            this.model.associated_accounts.removeObject(account);
+          } else {
+            bootbox.alert(result.message);
+          }
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set(`revoking.${account.name}`, false));
+    },
+
+    toggleShowAllAuthTokens() {
+      this.toggleProperty("showAllAuthTokens");
+    },
+
+    revokeAuthToken(token) {
+      ajax(
+        userPath(
+          `${this.get("model.username_lower")}/preferences/revoke-auth-token`
+        ),
+        {
+          type: "POST",
+          data: token ? { token_id: token.id } : {}
+        }
+      )
+        .then(() => {
+          if (!token) {
+            const redirect = this.siteSettings.logout_redirect;
+            if (Ember.isEmpty(redirect)) {
+              window.location = Discourse.getURL("/");
+            } else {
+              window.location.href = redirect;
+            }
+          }
+        })
+        .catch(popupAjaxError);
+    },
+
+    showToken(token) {
+      showModal("auth-token", { model: token });
+    },
+
+    connectAccount(method) {
+      method.doLogin({ reconnect: true });
     }
   }
-);
+});
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index d45e3fad89..b0ec789200 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
index c7ad39668d..9f59a93e4b 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import { propertyEqual } from "discourse/lib/computed";
 import InputValidation from "discourse/models/input-validation";
 import { emailValid } from "discourse/lib/utilities";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   taken: false,
   saving: false,
   error: false,
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
index 2db23b6f4d..cc8d8aab4e 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -8,7 +9,7 @@ const EMAIL_LEVELS = {
   NEVER: 2
 };
 
-export default Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   emailMessagesLevelAway: Ember.computed.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 e5b7bf42bf..b678d7076b 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
 import {
@@ -27,7 +28,7 @@ const USER_HOMES = {
 const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
 const TITLE_COUNT_MODES = ["notifications", "contextual"];
 
-export default Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   @computed("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 77690846d5..8030885efb 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -1,8 +1,9 @@
+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 Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   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 5d1dde4b76..f253c027f4 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { cookAsync } from "discourse/lib/text";
 
-export default Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
index 34eb99d0e1..04ad204320 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import { default as DiscourseURL, userPath } from "discourse/lib/url";
@@ -6,7 +7,7 @@ import { findAll } from "discourse/models/login-method";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Controller.extend(CanCheckEmails, {
+export default Controller.extend(CanCheckEmails, {
   loading: false,
   dirty: false,
   resetPasswordLoading: false,
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
index e149711bd3..85d1241ad3 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index 367f83903c..28d683a971 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import {
   default as computed,
   observes
@@ -7,7 +8,7 @@ import DiscourseURL from "discourse/lib/url";
 import { userPath } from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   taken: false,
   saving: false,
   errorMessage: null,
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
index 9f213a3090..aca7b02fda 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(PreferencesTabController, {
+export default Controller.extend(PreferencesTabController, {
   ignoredUsernames: Ember.computed.alias("model.ignored_usernames"),
   userIsMemberOrAbove: Ember.computed.gte("model.trust_level", 2),
   ignoredEnabled: Ember.computed.or("userIsMemberOrAbove", "model.staff"),
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
index e671f3eef3..07a58388a2 100644
--- a/app/assets/javascripts/discourse/controllers/raw-email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import Post from "discourse/models/post";
 import IncomingEmail from "admin/models/incoming-email";
 
 // This controller handles displaying of raw email
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   rawEmail: "",
   textPart: "",
   htmlPart: "",
diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6
index 9a7a01d1ef..b08bc2d646 100644
--- a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
 import BufferedContent from "discourse/mixins/buffered-content";
 import { extractError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, BufferedContent, {
+export default Controller.extend(ModalFunctionality, BufferedContent, {
   @computed("buffered.id", "id")
   renameDisabled(inputTagName, currentTagName) {
     const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index d893fa5b0d..05d69d39c6 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy';
@@ -8,7 +9,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import Ember from "ember";
 
-export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
+export default Controller.extend(ModalFunctionality, Ember.Evented, {
   init() {
     this._super(...arguments);
 
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.es6
index dd3a995160..0bab180cb9 100644
--- a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
+++ b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import DiscourseURL from "discourse/lib/url";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   reason: Ember.computed.alias("model.membership_request_template"),
 
diff --git a/app/assets/javascripts/discourse/controllers/review-index.js.es6 b/app/assets/javascripts/discourse/controllers/review-index.js.es6
index f65fd2129b..75ab25b4f1 100644
--- a/app/assets/javascripts/discourse/controllers/review-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/review-index.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: [
     "priority",
     "type",
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js.es6 b/app/assets/javascripts/discourse/controllers/review-settings.js.es6
index d3ee32ccf7..8e670adb2a 100644
--- a/app/assets/javascripts/discourse/controllers/review-settings.js.es6
+++ b/app/assets/javascripts/discourse/controllers/review-settings.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   saving: false,
   saved: false,
 
diff --git a/app/assets/javascripts/discourse/controllers/search-help.js.es6 b/app/assets/javascripts/discourse/controllers/search-help.js.es6
index be04358f4b..654722d2c7 100644
--- a/app/assets/javascripts/discourse/controllers/search-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/search-help.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed
   showGoogleSearch() {
     return !Discourse.SiteSettings.login_required;
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 f19bb5a0f7..54f41fc405 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
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import {
   bufferToBase64,
@@ -6,7 +7,7 @@ import {
 } from "discourse/lib/webauthn";
 
 // model for this controller is user.js.es6
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
 
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 ac105f57b2..eab4f2943f 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
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   secondFactorImage: null,
   secondFactorKey: null,
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.es6
index e11f484fbc..ddddfbdb30 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
   successMessage: null,
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.es6
index 90815cfbea..8507448607 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   actions: {
     disableSecurityKey() {
       this.user
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6
index e39f0f2b65..c11b278158 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   actions: {
     disableSecondFactor() {
       this.user
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 82fd514e16..65c8de32bf 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 import { userPath } from "discourse/lib/url";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
 
   showLoginButton: Ember.computed.equal("model.path", "login"),
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
index 7b80def0b7..725b088db1 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   tagGroups: Ember.inject.controller(),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
index e4515d90b9..cfde9214ea 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import TagGroup from "discourse/models/tag-group";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     selectTagGroup(tagGroup) {
       if (this.selectedItem) {
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
index fa20f97f2f..81457b585c 100644
--- a/app/assets/javascripts/discourse/controllers/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   sortedByCount: true,
   sortedByName: false,
 
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 0c1c77e610..abd2798d26 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import {
   default as computed,
   observes
@@ -48,7 +49,7 @@ if (customNavItemHref) {
   });
 }
 
-export default Ember.Controller.extend(BulkTopicSelection, {
+export default Controller.extend(BulkTopicSelection, {
   application: Ember.inject.controller(),
 
   tag: null,
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index 5d9c287cf2..6df0ba9ac8 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 const _buttons = [];
@@ -67,7 +68,7 @@ addBulkButton("deleteTopics", "delete", {
 });
 
 // Modal for performing bulk actions on topics
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   tags: null,
 
   emptyTags: Ember.computed.empty("tags"),
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 5e368497f2..f62884e3dc 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
 import DiscourseURL from "discourse/lib/url";
@@ -33,7 +34,7 @@ export function registerCustomPostMessageCallback(type, callback) {
   customPostMessageCallbacks[type] = callback;
 }
 
-export default Ember.Controller.extend(bufferedProperty("model"), {
+export default Controller.extend(bufferedProperty("model"), {
   composer: Ember.inject.controller(),
   application: Ember.inject.controller(),
   multiSelect: false,
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
index 73397bb07a..cfb051c1f2 100644
--- a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import {
   default as computed,
@@ -17,7 +18,7 @@ function uploadTranslate(key) {
   return `upload_selector.${key}`;
 }
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   showMore: false,
   imageUrl: null,
   imageLink: null,
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index d8e6f29dca..c82155802a 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
   router: Ember.inject.service(),
   user: Ember.inject.controller(),
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index 9046c373bd..49b9c006a5 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   user: Ember.inject.controller(),
   username: Ember.computed.alias("user.model.username_lower"),
   sortedBadges: Ember.computed.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 0f26ea5e59..1d59df2319 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import {
   default as DiscourseURL,
   userPath,
   groupPath
 } from "discourse/lib/url";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   topic: Ember.inject.controller(),
   router: Ember.inject.service(),
 
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 23bbd45295..7f2ef2ee87 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import Invite from "discourse/models/invite";
 import debounce from "discourse/lib/debounce";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -6,7 +7,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   user: null,
   model: null,
   filter: null,
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index bb94ee6f50..e309e9349b 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
 
   @observes("model.canLoadMore")
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index 25c730d97a..d60f93f45c 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   application: Ember.inject.controller(),
 
   _showFooter: function() {
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.es6
index 1be6e948c4..d1c311f893 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   sortProperties: ["count:desc", "id"],
   tagsForUser: null,
   sortedByCount: true,
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 c5e1bd9452..cb4919867a 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import Topic from "discourse/models/topic";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   router: Ember.inject.service(),
   userTopicsList: Ember.inject.controller("user-topics-list"),
   user: Ember.inject.controller(),
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index 2e88396cb7..1f4ba939f2 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { durationTiny } from "discourse/lib/formatter";
 
 // should be kept in sync with 'UserSummary::MAX_BADGES'
 const MAX_BADGES = 6;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   userController: Ember.inject.controller("user"),
   user: Ember.computed.alias("userController.model"),
 
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 dd453138d8..b7b1bb7d12 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 // Lists of topics on a user's page.
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
 
   hideCategory: false,
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index e59b0edfdc..f1f90bfa94 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import computed from "ember-addons/ember-computed-decorators";
 import User from "discourse/models/user";
 import optionalService from "discourse/lib/optional-service";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 
-export default Ember.Controller.extend(CanCheckEmails, {
+export default Controller.extend(CanCheckEmails, {
   indexStream: false,
   router: Ember.inject.service(),
   userNotifications: Ember.inject.controller("user-notifications"),
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 2fa9a8de59..61476963a0 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
   queryParams: ["period", "order", "asc", "name", "group", "exclude_usernames"],
   period: "weekly",
diff --git a/app/assets/javascripts/wizard/controllers/application.js.es6 b/app/assets/javascripts/wizard/controllers/application.js.es6
index a98fff8d9d..58aede12a1 100644
--- a/app/assets/javascripts/wizard/controllers/application.js.es6
+++ b/app/assets/javascripts/wizard/controllers/application.js.es6
@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   currentStepId: null,
 
   @computed("currentStepId")
diff --git a/app/assets/javascripts/wizard/controllers/step.js.es6 b/app/assets/javascripts/wizard/controllers/step.js.es6
index 7c63257039..25e0ba0a4b 100644
--- a/app/assets/javascripts/wizard/controllers/step.js.es6
+++ b/app/assets/javascripts/wizard/controllers/step.js.es6
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   wizard: null,
   step: null,
 
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-index.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-index.js.es6.erb
index 044750a7ed..1e7a349b55 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-index.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-index.js.es6.erb
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   actions: {
   }
 });
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-show.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-show.js.es6.erb
index 044750a7ed..1e7a349b55 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-show.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller-show.js.es6.erb
@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   actions: {
   }
 });
diff --git a/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller.js.es6.erb b/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller.js.es6.erb
index 2d3f9600e2..1c0ee0801d 100644
--- a/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller.js.es6.erb
+++ b/lib/generators/plugin/templates/assets/javascripts/discourse/controllers/controller.js.es6.erb
@@ -1 +1,2 @@
-export default Ember.Controller.extend({});
+import Controller from "@ember/controller";
+export default Controller.extend({});
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index df1c4b0681..fdb7e0498e 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   regularPollType: "regular",
   numberPollType: "number",
   multiplePollType: "multiple",
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js.es6
index c08276c80d..19d390a5ef 100644
--- a/test/javascripts/mixins/grant-badge-controller-test.js.es6
+++ b/test/javascripts/mixins/grant-badge-controller-test.js.es6
@@ -1,11 +1,10 @@
+import Controller from "@ember/controller";
 import GrantBadgeControllerMixin from "discourse/mixins/grant-badge-controller";
 import Badge from "discourse/models/badge";
 
 QUnit.module("mixin:grant-badge-controller", {
   before: function() {
-    this.GrantBadgeController = Ember.Controller.extend(
-      GrantBadgeControllerMixin
-    );
+    this.GrantBadgeController = Controller.extend(GrantBadgeControllerMixin);
 
     this.badgeFirst = Badge.create({
       id: 3,

From 391db256658dd491689f42082a28cce07ed54725 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 13:08:41 -0400
Subject: [PATCH 148/328] FIX: Sortable controller var conflict

---
 .../discourse/controllers/discovery-sortable.js.es6         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index abe0e3795e..643caff533 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -26,14 +26,14 @@ controllerOpts.queryParams.forEach(
   p => (controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`))
 );
 
-const Controller = Controller.extend(controllerOpts);
+const SortableController = Controller.extend(controllerOpts);
 
 export const addDiscoveryQueryParam = function(p, opts) {
   queryParams[p] = opts;
   const cOpts = {};
   cOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`);
   cOpts["queryParams"] = Object.keys(queryParams);
-  Controller.reopen(cOpts);
+  SortableController.reopen(cOpts);
 
   if (opts && opts.persisted) {
     DiscourseNavigation.reopen({
@@ -42,4 +42,4 @@ export const addDiscoveryQueryParam = function(p, opts) {
   }
 };
 
-export default Controller;
+export default SortableController;

From 39159ad5e4ef7e6cfa7cf04f2a26e93a41a1b5d9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 13:15:28 -0400
Subject: [PATCH 149/328] FIX: Wizard tests were broken with new loader

---
 app/assets/javascripts/wizard/components/invite-list.js.es6 | 1 +
 app/assets/javascripts/wizard/test/test_helper.js           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index bbf0af5a1c..e8b25973a6 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -1,4 +1,5 @@
 import Component from "@ember/component";
+
 export default Component.extend({
   classNames: ["invite-list"],
   users: null,
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 3d26843532..50ed3d4afd 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -2,10 +2,10 @@
 
 //= require env
 //= require jquery.debug
+//= require ember.debug
 //= require discourse-loader
 //= require jquery.debug
 //= require handlebars
-//= require ember.debug
 //= require ember-template-compiler
 //= require qunit/qunit/qunit
 //= require ember-qunit

From 9347108f0294916e43aeb70b8c60e944132e2234 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 23 Oct 2019 13:25:25 -0400
Subject: [PATCH 150/328] Support for importing jQuery

Also remove Ember.Qunit error about Ember.$ for now
---
 app/assets/javascripts/discourse-loader.js    | 1 +
 app/assets/javascripts/wizard/lib/ajax.js.es6 | 3 ++-
 vendor/assets/javascripts/ember-qunit.js      | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index f20e7d1ab7..7831db85c8 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -5,6 +5,7 @@ var define, requirejs;
   var EMBER_MODULES = {};
   if (typeof Ember !== "undefined") {
     EMBER_MODULES = {
+      jquery: { default: $ },
       "@ember/component": { default: Ember.Component },
       "@ember/controller": { default: Ember.Controller },
       "@ember/object": { default: Ember.Object },
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js.es6
index e1a7933805..9112c3787f 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js.es6
+++ b/app/assets/javascripts/wizard/lib/ajax.js.es6
@@ -1,4 +1,5 @@
 import getUrl from "discourse-common/lib/get-url";
+import jQuery from "jquery";
 
 let token;
 
@@ -16,6 +17,6 @@ export function ajax(args) {
     args.success = data => Ember.run(null, resolve, data);
     args.error = xhr => Ember.run(null, reject, xhr);
     args.url = getUrl(args.url);
-    Ember.$.ajax(args);
+    jQuery.ajax(args);
   });
 }
diff --git a/vendor/assets/javascripts/ember-qunit.js b/vendor/assets/javascripts/ember-qunit.js
index fd722360ee..37e2d05067 100644
--- a/vendor/assets/javascripts/ember-qunit.js
+++ b/vendor/assets/javascripts/ember-qunit.js
@@ -1874,7 +1874,7 @@ define('ember-test-helpers/wait', ['exports', 'ember'], function (exports, _embe
   exports._setupAJAXHooks = _setupAJAXHooks;
   exports['default'] = wait;
 
-  var jQuery = _ember['default'].$;
+  var jQuery = $;
 
   var requests;
   function incrementAjaxPendingRequests(_, xhr) {
@@ -1988,4 +1988,4 @@ for (var exportName in emberQUnit) {
 }
 
 })();
-//# sourceMappingURL=ember-qunit.map
\ No newline at end of file
+//# sourceMappingURL=ember-qunit.map

From 31577b21312ac3a09b72aa9b3d21a99776343d5c Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 23 Oct 2019 23:35:38 +0530
Subject: [PATCH 151/328] FEATURE: wiki editors are allowed edit tags for wiki
 topics.

If a wiki editor's TL is greater than 'min trust level to tag topics' site setting then they can edit the tags for any wiki topic.
---
 .../components/composer-title.js.es6          |  1 +
 .../discourse/controllers/composer.js.es6     |  3 ++
 .../discourse/models/composer.js.es6          | 43 ++++++++++---------
 .../javascripts/discourse/models/topic.js.es6 | 12 ++++++
 .../templates/components/composer-title.hbs   |  2 +-
 .../discourse/templates/composer.hbs          |  3 +-
 app/controllers/topics_controller.rb          | 10 +++++
 .../topic_view_details_serializer.rb          |  7 ++-
 config/routes.rb                              |  1 +
 lib/guardian/topic_guardian.rb                | 12 ++++++
 spec/requests/topics_controller_spec.rb       | 25 +++++++++++
 .../serializers/topic_view_serializer_spec.rb | 20 +++++++++
 12 files changed, 115 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 5302ab85f4..adc0b330e8 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -10,6 +10,7 @@ import afterTransition from "discourse/lib/after-transition";
 export default Ember.Component.extend({
   classNames: ["title-input"],
   watchForLink: Ember.computed.alias("composer.canEditTopicFeaturedLink"),
+  disabled: Ember.computed.or("composer.loading", "composer.disableTitleInput"),
 
   didInsertElement() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 595568eec2..b1f7daafbe 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -186,6 +186,9 @@ export default Ember.Controller.extend({
     );
   },
 
+  disableCategoryChooser: Ember.computed.not("model.topic.details.can_edit"),
+  disableTagsChooser: Ember.computed.not("model.topic.canEditTags"),
+
   isStaffUser: Ember.computed.reads("currentUser.staff"),
 
   canUnlistTopic: Ember.computed.and("model.creatingTopic", "isStaffUser"),
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 4517051df3..34b44985df 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -141,6 +141,7 @@ const Composer = RestModel.extend({
   creatingPrivateMessage: Ember.computed.equal("action", PRIVATE_MESSAGE),
   notCreatingPrivateMessage: Ember.computed.not("creatingPrivateMessage"),
   notPrivateMessage: Ember.computed.not("privateMessage"),
+  disableTitleInput: Ember.computed.not("topic.details.can_edit"),
 
   @computed("privateMessage", "archetype.hasOptions")
   showCategoryChooser(isPrivateMessage, hasOptions) {
@@ -784,31 +785,31 @@ const Composer = RestModel.extend({
     let promise = Ember.RSVP.resolve();
 
     // Update the topic if we're editing the first post
-    if (
-      this.title &&
-      post.post_number === 1 &&
-      this.get("topic.details.can_edit")
-    ) {
-      const topicProps = this.getProperties(
-        Object.keys(_edit_topic_serializer)
-      );
-      // frontend should have featuredLink but backend needs featured_link
-      if (topicProps.featuredLink) {
-        topicProps.featured_link = topicProps.featuredLink;
-        delete topicProps.featuredLink;
-      }
-
+    if (this.title && post.post_number === 1) {
       const topic = this.topic;
 
-      // If we're editing a shared draft, keep the original category
-      if (this.action === EDIT_SHARED_DRAFT) {
-        const destinationCategoryId = topicProps.categoryId;
-        promise = promise.then(() =>
-          topic.updateDestinationCategory(destinationCategoryId)
+      if (topic.details.can_edit) {
+        const topicProps = this.getProperties(
+          Object.keys(_edit_topic_serializer)
         );
-        topicProps.categoryId = topic.get("category.id");
+        // frontend should have featuredLink but backend needs featured_link
+        if (topicProps.featuredLink) {
+          topicProps.featured_link = topicProps.featuredLink;
+          delete topicProps.featuredLink;
+        }
+
+        // If we're editing a shared draft, keep the original category
+        if (this.action === EDIT_SHARED_DRAFT) {
+          const destinationCategoryId = topicProps.categoryId;
+          promise = promise.then(() =>
+            topic.updateDestinationCategory(destinationCategoryId)
+          );
+          topicProps.categoryId = topic.get("category.id");
+        }
+        promise = promise.then(() => Topic.update(topic, topicProps));
+      } else if (topic.details.can_edit_tags) {
+        promise = promise.then(() => topic.updateTags(this.tags));
       }
-      promise = promise.then(() => Topic.update(topic, topicProps));
     }
 
     const props = {
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 1af3697106..03345d7744 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -546,6 +546,7 @@ const Topic = RestModel.extend({
 
   readLastPost: propertyEqual("last_read_post_number", "highest_post_number"),
   canClearPin: Ember.computed.and("pinned", "readLastPost"),
+  canEditTags: Ember.computed.or("details.can_edit", "details.can_edit_tags"),
 
   archiveMessage() {
     this.set("archiving", true);
@@ -610,6 +611,17 @@ const Topic = RestModel.extend({
     return ajax(`/t/${this.id}/reset-bump-date`, { type: "PUT" }).catch(
       popupAjaxError
     );
+  },
+
+  updateTags(tags) {
+    if (!tags || tags.length === 0) {
+      tags = [""];
+    }
+
+    return ajax(`/t/${this.id}/tags`, {
+      type: "PUT",
+      data: { tags: tags }
+    });
   }
 });
 
diff --git a/app/assets/javascripts/discourse/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-title.hbs
index 76f63dac1f..a8483595de 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-title.hbs
@@ -3,7 +3,7 @@
              id="reply-title"
              maxLength=titleMaxLength
              placeholderKey=composer.titlePlaceholder
-             disabled=composer.loading
+             disabled=disabled
              autocomplete="discourse"}}
 
 {{popup-input-tip validation=validation}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43c3599ec8..f738efc362 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -76,12 +76,13 @@
                         fullWidthOnMobile=true
                         value=model.categoryId
                         scopedCategoryId=scopedCategoryId
+                        isDisabled=disableCategoryChooser
                         tabindex="3"}}
                       {{popup-input-tip validation=categoryValidation}}
                     </div>
                   {{/if}}
                   {{#if canEditTags}}
-                    {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId minimum=model.minimumRequiredTags}}
+                    {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId minimum=model.minimumRequiredTags isDisabled=disableTagsChooser}}
                     {{popup-input-tip validation=tagValidation}}
                   {{/if}}
                 </div>
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 7e50ec7400..2c29594e66 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -374,6 +374,16 @@ class TopicsController < ApplicationController
     success ? render_serialized(topic, BasicTopicSerializer) : render_json_error(topic)
   end
 
+  def update_tags
+    params.require(:tags)
+    topic = Topic.find_by(id: params[:topic_id])
+    guardian.ensure_can_edit_tags!(topic)
+
+    success = PostRevisor.new(topic.first_post, topic).revise!(current_user, { tags: params[:tags] }, validate_post: false)
+
+    success ? render_serialized(topic, BasicTopicSerializer) : render_json_error(topic)
+  end
+
   def feature_stats
     params.require(:category_id)
     category_id = params[:category_id].to_i
diff --git a/app/serializers/topic_view_details_serializer.rb b/app/serializers/topic_view_details_serializer.rb
index c80ba6dece..d21b1a778b 100644
--- a/app/serializers/topic_view_details_serializer.rb
+++ b/app/serializers/topic_view_details_serializer.rb
@@ -14,7 +14,8 @@ class TopicViewDetailsSerializer < ApplicationSerializer
      :can_reply_as_new_topic,
      :can_flag_topic,
      :can_convert_topic,
-     :can_review_topic]
+     :can_review_topic,
+     :can_edit_tags]
   end
 
   attributes(
@@ -128,6 +129,10 @@ class TopicViewDetailsSerializer < ApplicationSerializer
     scope.can_convert_topic?(object.topic)
   end
 
+  def include_can_edit_tags?
+    !scope.can_edit?(object.topic) && scope.can_edit_tags?(object.topic)
+  end
+
   def allowed_users
     object.topic.allowed_users.reject { |user| object.group_allowed_user_ids.include?(user.id) }
   end
diff --git a/config/routes.rb b/config/routes.rb
index 55f2cd7a53..290282be38 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -754,6 +754,7 @@ Discourse::Application.routes.draw do
   delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: { topic_id: /\d+/ }
   put "t/:topic_id/bookmark" => "topics#bookmark", constraints: { topic_id: /\d+/ }
   put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/tags" => "topics#update_tags", constraints: { topic_id: /\d+/ }
 
   post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: { topic_id: /\d+/ }
 
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 80cc2a3cf3..b6d8a27306 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -184,4 +184,16 @@ module TopicGuardian
   def can_banner_topic?(topic)
     topic && authenticated? && !topic.private_message? && is_staff?
   end
+
+  def can_edit_tags?(topic)
+    return false unless can_tag_topics?
+    return false if topic.private_message? && !can_tag_pms?
+    return true if can_edit_topic?(topic)
+
+    if topic&.first_post&.wiki && (@user.trust_level >= SiteSetting.min_trust_to_edit_wiki_post.to_i)
+      return can_create_post?(topic)
+    end
+
+    false
+  end
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 1420083154..357ce90fbb 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1027,6 +1027,31 @@ RSpec.describe TopicsController do
             expect(topic.tags.pluck(:id)).to contain_exactly(tag.id)
           end
 
+          it "can add a tag to wiki topic" do
+            SiteSetting.min_trust_to_edit_wiki_post = 2
+            topic.first_post.update!(wiki: true)
+            user = Fabricate(:user)
+            sign_in(user)
+
+            expect do
+              put "/t/#{topic.id}/tags.json", params: {
+                tags: [tag.name]
+              }
+            end.not_to change { topic.reload.first_post.revisions.count }
+
+            expect(response.status).to eq(403)
+            user.update!(trust_level: 2)
+
+            expect do
+              put "/t/#{topic.id}/tags.json", params: {
+                tags: [tag.name]
+              }
+            end.to change { topic.reload.first_post.revisions.count }.by(1)
+
+            expect(response.status).to eq(200)
+            expect(topic.tags.pluck(:id)).to contain_exactly(tag.id)
+          end
+
           it 'does not remove tag if no params is given' do
             topic.tags << tag
 
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index ccf8a64758..b0627ab05f 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -257,6 +257,26 @@ describe TopicViewSerializer do
       expect(details[:allowed_users].find { |au| au[:id] == pm.user_id }).to be_present
       expect(details[:allowed_groups].find { |ag| ag[:id] == group.id }).to be_present
     end
+
+    context "can_edit_tags" do
+      before do
+        SiteSetting.tagging_enabled = true
+        SiteSetting.min_trust_to_edit_wiki_post = 2
+      end
+
+      it "returns true when user can edit a wiki topic" do
+        post = Fabricate(:post, wiki: true)
+        topic = Fabricate(:topic, first_post: post)
+
+        json = serialize_topic(topic, user)
+        expect(json[:details][:can_edit_tags]).to be_nil
+
+        user.update!(trust_level: 2)
+
+        json = serialize_topic(topic, user)
+        expect(json[:details][:can_edit_tags]).to eq(true)
+      end
+    end
   end
 
 end

From 0dcb4bef201a097f63c8f9d51dd87d6ede8fd81b Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 24 Oct 2019 01:04:37 +0530
Subject: [PATCH 152/328] FIX: should not disable topic inputs while creating
 new topic.

31577b21312ac3a09b72aa9b3d21a99776343d5c
---
 .../javascripts/discourse/controllers/composer.js.es6 | 11 +++++++++--
 .../javascripts/discourse/models/composer.js.es6      |  6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index cf839d8e8a..ad34970e5b 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -187,8 +187,15 @@ export default Controller.extend({
     );
   },
 
-  disableCategoryChooser: Ember.computed.not("model.topic.details.can_edit"),
-  disableTagsChooser: Ember.computed.not("model.topic.canEditTags"),
+  @computed("model.editingPost", "model.topic.details.can_edit")
+  disableCategoryChooser(editingPost, canEditTopic) {
+    return editingPost && !canEditTopic;
+  },
+
+  @computed("model.editingPost", "model.topic.canEditTags")
+  disableTagsChooser(editingPost, canEditTags) {
+    return editingPost && !canEditTags;
+  },
 
   isStaffUser: Ember.computed.reads("currentUser.staff"),
 
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 34b44985df..686d98c5fb 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -141,7 +141,11 @@ const Composer = RestModel.extend({
   creatingPrivateMessage: Ember.computed.equal("action", PRIVATE_MESSAGE),
   notCreatingPrivateMessage: Ember.computed.not("creatingPrivateMessage"),
   notPrivateMessage: Ember.computed.not("privateMessage"),
-  disableTitleInput: Ember.computed.not("topic.details.can_edit"),
+
+  @computed("editingPost", "topic.details.can_edit")
+  disableTitleInput(editingPost, canEditTopic) {
+    return editingPost && !canEditTopic;
+  },
 
   @computed("privateMessage", "archetype.hasOptions")
   showCategoryChooser(isPrivateMessage, hasOptions) {

From f061aee818c51d88359e9b1d4059c5e85be85891 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 23 Oct 2019 15:41:58 -0400
Subject: [PATCH 153/328] FEATURE: support SCSS in custom email style

In the CSS tab of Admin > Customize > Email Style, SCSS can now be used.
---
 .../components/email-styles-editor.js.es6     |  5 ++++
 .../components/email-styles-editor.hbs        |  2 +-
 app/models/email_style.rb                     |  8 +++++
 app/services/email_style_updater.rb           | 29 ++++++++++++++-----
 config/site_settings.yml                      |  3 ++
 lib/email/styles.rb                           |  2 +-
 spec/integration/email_style_spec.rb          |  2 ++
 spec/services/email_style_updater_spec.rb     | 22 +++++++++++---
 8 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js.es6 b/app/assets/javascripts/admin/components/email-styles-editor.js.es6
index 75811ec41c..c0b6c732e9 100644
--- a/app/assets/javascripts/admin/components/email-styles-editor.js.es6
+++ b/app/assets/javascripts/admin/components/email-styles-editor.js.es6
@@ -4,6 +4,11 @@ import computed from "ember-addons/ember-computed-decorators";
 export default Component.extend({
   editorId: Ember.computed.reads("fieldName"),
 
+  @computed("fieldName")
+  currentEditorMode(fieldName) {
+    return fieldName === "css" ? "scss" : fieldName;
+  },
+
   @computed("fieldName", "styles.html", "styles.css")
   resetDisabled(fieldName) {
     return (
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 883149644d..e03feb7cb7 100644
--- a/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
@@ -9,7 +9,7 @@
   </div>
 </div>
 
-{{ace-editor content=editorContents mode=fieldName editorId=editorId}}
+{{ace-editor content=editorContents mode=currentEditorMode editorId=editorId}}
 
 <div class='admin-footer'>
   <div class='buttons'>
diff --git a/app/models/email_style.rb b/app/models/email_style.rb
index 6d460ccbd1..d02de6a59a 100644
--- a/app/models/email_style.rb
+++ b/app/models/email_style.rb
@@ -17,6 +17,10 @@ class EmailStyle
     SiteSetting.email_custom_css || default_css
   end
 
+  def compiled_css
+    SiteSetting.email_custom_css_compiled || self.class.default_css_compiled
+  end
+
   def default_html
     self.class.default_template
   end
@@ -34,4 +38,8 @@ class EmailStyle
   def self.default_css
     ''
   end
+
+  def self.default_css_compiled
+    ''
+  end
 end
diff --git a/app/services/email_style_updater.rb b/app/services/email_style_updater.rb
index d0fb918636..d13e84b78d 100644
--- a/app/services/email_style_updater.rb
+++ b/app/services/email_style_updater.rb
@@ -10,26 +10,39 @@ class EmailStyleUpdater
   end
 
   def update(attrs)
+    if attrs.has_key?(:html) && !attrs[:html].include?('%{email_content}')
+      @errors << I18n.t(
+        'email_style.html_missing_placeholder',
+        placeholder: '%{email_content}'
+      )
+    end
+
+    if attrs.has_key?(:css)
+      begin
+        compiled_css = SassC::Engine.new(attrs[:css], style: :compressed).render
+      rescue SassC::SyntaxError => e
+        # @errors << I18n.t('email_style.css_syntax_error')
+        @errors << e.message[0...(e.message.index("\n"))]
+      end
+    end
+
+    return false unless @errors.empty?
+
     if attrs.has_key?(:html)
       if attrs[:html] == EmailStyle.default_template
         SiteSetting.remove_override!(:email_custom_template)
       else
-        if !attrs[:html].include?('%{email_content}')
-          @errors << I18n.t(
-            'email_style.html_missing_placeholder',
-            placeholder: '%{email_content}'
-          )
-        else
-          SiteSetting.email_custom_template = attrs[:html]
-        end
+        SiteSetting.email_custom_template = attrs[:html]
       end
     end
 
     if attrs.has_key?(:css)
       if attrs[:css] == EmailStyle.default_css
         SiteSetting.remove_override!(:email_custom_css)
+        SiteSetting.remove_override!(:email_custom_css_compiled)
       else
         SiteSetting.email_custom_css = attrs[:css]
+        SiteSetting.email_custom_css_compiled = compiled_css
       end
     end
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index d4ca816af7..6a44f4b609 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1044,6 +1044,9 @@ email:
   email_custom_css:
     default: ""
     hidden: true
+  email_custom_css_compiled:
+    default: ""
+    hidden: true
   email_total_attachment_size_limit_kb:
     default: 0
     max: 51200
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index b3ee704103..9354f52666 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -36,7 +36,7 @@ module Email
     def custom_styles
       return @custom_styles unless @custom_styles.nil?
 
-      css = EmailStyle.new.css
+      css = EmailStyle.new.compiled_css
       @custom_styles = {}
 
       if !css.blank?
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index e035aec102..bfe08f16a3 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -6,6 +6,7 @@ describe EmailStyle do
   before do
     SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
     SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
+    SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
   end
 
   after do
@@ -93,6 +94,7 @@ describe EmailStyle do
     context 'with some bad css' do
       before do
         SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
+        SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
       end
 
       it "can render the html" do
diff --git a/spec/services/email_style_updater_spec.rb b/spec/services/email_style_updater_spec.rb
index 3ef6f1c7ea..82281de7dd 100644
--- a/spec/services/email_style_updater_spec.rb
+++ b/spec/services/email_style_updater_spec.rb
@@ -7,6 +7,12 @@ describe EmailStyleUpdater do
   let(:default_html) { File.read("#{Rails.root}/app/views/email/default_template.html") }
   let(:updater) { EmailStyleUpdater.new(admin) }
 
+  def expect_settings_to_be_unset
+    expect(SiteSetting.email_custom_template).to_not be_present
+    expect(SiteSetting.email_custom_css).to_not be_present
+    expect(SiteSetting.email_custom_css_compiled).to_not be_present
+  end
+
   describe 'update' do
     it 'can change the settings' do
       expect(
@@ -17,20 +23,20 @@ describe EmailStyleUpdater do
       ).to eq(true)
       expect(SiteSetting.email_custom_template).to eq('For you: %{email_content}')
       expect(SiteSetting.email_custom_css).to eq('h1 { color: blue; }')
+      expect(SiteSetting.email_custom_css_compiled.strip).to eq('h1{color:blue}')
     end
 
     it 'will not store defaults' do
       updater.update(html: default_html, css: '')
-      expect(SiteSetting.email_custom_template).to_not be_present
-      expect(SiteSetting.email_custom_css).to_not be_present
+      expect_settings_to_be_unset
     end
 
     it 'can clear settings if defaults given' do
       SiteSetting.email_custom_template = 'For you: %{email_content}'
       SiteSetting.email_custom_css = 'h1 { color: blue; }'
+      SiteSetting.email_custom_css_compiled = 'h1{color:blue}'
       updater.update(html: default_html, css: '')
-      expect(SiteSetting.email_custom_template).to_not be_present
-      expect(SiteSetting.email_custom_css).to_not be_present
+      expect_settings_to_be_unset
     end
 
     it 'fails if html is missing email_content' do
@@ -41,6 +47,14 @@ describe EmailStyleUpdater do
           placeholder: '%{email_content}'
         )
       )
+      expect_settings_to_be_unset
+    end
+
+    it 'fails if css is not valid scss' do
+      expect(updater.update(html: 'For you: %{email_content}', css: 'h1 { color: blue;')).to eq(false)
+      expect(updater.errors).to_not be_empty
+      expect(updater.errors.first).to include('Invalid CSS after')
+      expect_settings_to_be_unset
     end
   end
 end

From 40254bae1bdc18a8ecb861a89f7c6dd275ea32a9 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 24 Oct 2019 01:57:29 +0530
Subject: [PATCH 154/328] FIX: Do not load group members when user can't see
 it.

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

diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 2b0081e4e0..05bece07f8 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -42,7 +42,7 @@ const Group = RestModel.extend({
   },
 
   findMembers(params) {
-    if (Ember.isEmpty(this.name)) {
+    if (Ember.isEmpty(this.name) || !this.can_see_members) {
       return;
     }
 

From cfe26eb30196ea2ffe81fd77552de276760ccb24 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 23 Oct 2019 19:21:24 -0400
Subject: [PATCH 155/328] FIX: backwards compatibility for uncompiled email
 style css

---
 app/models/email_style.rb            | 6 +-----
 spec/integration/email_style_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/models/email_style.rb b/app/models/email_style.rb
index d02de6a59a..9aeb483f01 100644
--- a/app/models/email_style.rb
+++ b/app/models/email_style.rb
@@ -18,7 +18,7 @@ class EmailStyle
   end
 
   def compiled_css
-    SiteSetting.email_custom_css_compiled || self.class.default_css_compiled
+    SiteSetting.email_custom_css_compiled.presence || css
   end
 
   def default_html
@@ -38,8 +38,4 @@ class EmailStyle
   def self.default_css
     ''
   end
-
-  def self.default_css_compiled
-    ''
-  end
 end
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index bfe08f16a3..ef69850891 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -25,6 +25,12 @@ describe EmailStyle do
       expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
     end
 
+    it 'applies customizations if compiled is missing' do
+      SiteSetting.remove_override!(:email_custom_css_compiled)
+      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+    end
+
     it 'can apply RTL attrs' do
       SiteSetting.default_locale = 'he'
       body_attrs = mail_html.match(/<body ([^>])+/)

From f530378df336051bdfac7c418eb2c4ab4726c9b2 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 24 Oct 2019 11:46:22 +1100
Subject: [PATCH 156/328] FIX: Restore for non-multisite is not raising an
 error on reconnect step (#8237)

That commit introduced a bug to the system: https://github.com/discourse/discourse/commit/f69dacf979317946ed4a3e81e85fcca1b45bedf0

Restore works fine for multisite, however, stopped working for non-multisite.

Reason for that was that `establish_connection` method got a check if the multisite instance is available:
```
    def self.instance
      @instance
    end

    def self.establish_connection(opts)
      @instance.establish_connection(opts) if @instance
    end
```
However, the reload method don't have that check
```
    def self.reload
      @instance = new(instance.config_filename)
    end
```

To solve it, let's ensure we are in a multisite environment before call reload
---
 lib/backup_restore/restorer.rb           | 2 +-
 spec/lib/backup_restore/restorer_spec.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 1efceafd12..8d902da8a1 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -404,7 +404,7 @@ module BackupRestore
 
     def reconnect_database
       log "Reconnecting to the database..."
-      RailsMultisite::ConnectionManagement::reload
+      RailsMultisite::ConnectionManagement::reload if RailsMultisite::ConnectionManagement::instance
       RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
     end
 
diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index 8bd311580f..4eac39bdd8 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -124,5 +124,10 @@ describe BackupRestore::Restorer do
       restorer.send(:reconnect_database)
       expect(RailsMultisite::ConnectionManagement.current_db).to eq('second')
     end
+
+    it 'it is not erroring for non multisite' do
+      RailsMultisite::ConnectionManagement::clear_settings!
+      expect{ restorer.send(:reconnect_database) }.not_to raise_error
+    end
   end
 end

From b8688c4af77399df846b8fc24416e888df10e2e8 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 24 Oct 2019 12:03:27 +1100
Subject: [PATCH 157/328] FIX: Rubocop rule on restorer spec (#8238)

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

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index 4eac39bdd8..fa928c5f3d 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -127,7 +127,7 @@ describe BackupRestore::Restorer do
 
     it 'it is not erroring for non multisite' do
       RailsMultisite::ConnectionManagement::clear_settings!
-      expect{ restorer.send(:reconnect_database) }.not_to raise_error
+      expect { restorer.send(:reconnect_database) }.not_to raise_error
     end
   end
 end

From b3cd83460bb1a216ad9f98a3b39c9e31b2e3a808 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 24 Oct 2019 14:25:56 +0530
Subject: [PATCH 158/328] FIX: check for presence of liked post before creating
 notification

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

diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index ee20f2d839..a49a341eca 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -76,7 +76,7 @@ class PostActionNotifier
     return unless post_action.is_like?
 
     post = post_action.post
-    return if post_action.user.blank?
+    return if post_action.user.blank? || post.blank?
 
     alerter.create_notification(
       post.user,

From e9897d295f7eef1be1bb7c414a2fc50c40df468f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 24 Oct 2019 11:58:33 +0100
Subject: [PATCH 159/328] DEV: Refactor user search spec to use prefabrication

Break up single large example into multiple examples, using fab! to maintain performance. On my machine, this speeds up the test slightly, and also makes it more readable.
---
 spec/models/user_search_spec.rb | 67 +++++++++++++++++----------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index 2c1fb83f78..f004a04637 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -4,24 +4,23 @@ require 'rails_helper'
 
 describe UserSearch do
 
-  let(:topic)     { Fabricate :topic }
-  let(:topic2)    { Fabricate :topic }
-  let(:topic3)    { Fabricate :topic }
-  let(:topic4)    { Fabricate :topic }
-  let(:user1)     { Fabricate :user, username: "mrb", name: "Michael Madsen", last_seen_at: 10.days.ago }
-  let(:user2)     { Fabricate :user, username: "mrblue",   name: "Eddie Code", last_seen_at: 9.days.ago }
-  let(:user3)     { Fabricate :user, username: "mrorange", name: "Tim Roth", last_seen_at: 8.days.ago }
-  let(:user4)     { Fabricate :user, username: "mrpink",   name: "Steve Buscemi",  last_seen_at: 7.days.ago }
-  let(:user5)     { Fabricate :user, username: "mrbrown",  name: "Quentin Tarantino", last_seen_at: 6.days.ago }
-  let(:user6)     { Fabricate :user, username: "mrwhite",  name: "Harvey Keitel",  last_seen_at: 5.days.ago }
-  let!(:inactive) { Fabricate :user, username: "Ghost", active: false }
-  let(:admin)     { Fabricate :admin, username: "theadmin" }
-  let(:moderator) { Fabricate :moderator, username: "themod" }
-  let(:staged)    { Fabricate :staged }
+  fab!(:indexer) { SearchIndexer.enable } # Enable before fab! topics/users
+  before { SearchIndexer.enable } # Enable for each test
 
-  before do
-    SearchIndexer.enable
-  end
+  fab!(:topic)     { Fabricate :topic }
+  fab!(:topic2)    { Fabricate :topic }
+  fab!(:topic3)    { Fabricate :topic }
+  fab!(:topic4)    { Fabricate :topic }
+  fab!(:user1)     { Fabricate :user, username: "mrb", name: "Michael Madsen", last_seen_at: 10.days.ago }
+  fab!(:user2)     { Fabricate :user, username: "mrblue",   name: "Eddie Code", last_seen_at: 9.days.ago }
+  fab!(:user3)     { Fabricate :user, username: "mrorange", name: "Tim Roth", last_seen_at: 8.days.ago }
+  fab!(:user4)     { Fabricate :user, username: "mrpink",   name: "Steve Buscemi",  last_seen_at: 7.days.ago }
+  fab!(:user5)     { Fabricate :user, username: "mrbrown",  name: "Quentin Tarantino", last_seen_at: 6.days.ago }
+  fab!(:user6)     { Fabricate :user, username: "mrwhite",  name: "Harvey Keitel",  last_seen_at: 5.days.ago }
+  fab!(:inactive) { Fabricate :user, username: "Ghost", active: false }
+  fab!(:admin)     { Fabricate :admin, username: "theadmin" }
+  fab!(:moderator) { Fabricate :moderator, username: "themod" }
+  fab!(:staged)    { Fabricate :staged }
 
   def search_for(*args)
     UserSearch.new(*args).search
@@ -90,23 +89,17 @@ describe UserSearch do
   end
 
   context "with seed data" do
+    fab!(:post1) { Fabricate :post, user: user1, topic: topic }
+    fab!(:post2) { Fabricate :post, user: user2, topic: topic2 }
+    fab!(:post3) { Fabricate :post, user: user3, topic: topic }
+    fab!(:post4) { Fabricate :post, user: user4, topic: topic }
+    fab!(:post5) { Fabricate :post, user: user5, topic: topic3 }
+    fab!(:post6) { Fabricate :post, user: user6, topic: topic }
+    fab!(:post7) { Fabricate :post, user: staged, topic: topic4 }
 
-    before do
+    before { user6.update(suspended_at: 1.day.ago, suspended_till: 1.year.from_now) }
 
-      Fabricate :post, user: user1, topic: topic
-      Fabricate :post, user: user2, topic: topic2
-      Fabricate :post, user: user3, topic: topic
-      Fabricate :post, user: user4, topic: topic
-      Fabricate :post, user: user5, topic: topic3
-      Fabricate :post, user: user6, topic: topic
-      Fabricate :post, user: staged, topic: topic4
-
-      user6.update(suspended_at: 1.day.ago, suspended_till: 1.year.from_now)
-    end
-
-    # this is a seriously expensive integration test,
-    # re-creating this entire test db is too expensive reuse
-    it "operates correctly" do
+    it "can search by name and username" do
       # normal search
       results = search_for(user1.name.split(" ").first)
       expect(results.size).to eq(1)
@@ -126,7 +119,9 @@ describe UserSearch do
       results = search_for(user4.username.upcase)
       expect(results.size).to eq(1)
       expect(results.first).to eq(user4)
+    end
 
+    it "handles substring search correctly" do
       # substrings
       # only staff members see suspended users in results
       results = search_for("mr")
@@ -147,7 +142,9 @@ describe UserSearch do
 
       results = search_for("MRB", searching_user: admin, limit: 2)
       expect(results.size).to eq(2)
+    end
 
+    it "prioritises topic participants" do
       # topic priority
       results = search_for(user1.username, topic_id: topic.id)
       expect(results.first).to eq(user1)
@@ -157,7 +154,9 @@ describe UserSearch do
 
       results = search_for(user1.username, topic_id: topic3.id)
       expect(results[1]).to eq(user5)
+    end
 
+    it "only searches by name when enabled" do
       # When searching by name is enabled, it returns the record
       SiteSetting.enable_names = true
       results = search_for("Tarantino")
@@ -173,11 +172,15 @@ describe UserSearch do
       SiteSetting.enable_names = false
       results = search_for("Tarantino")
       expect(results.size).to eq(0)
+    end
 
+    it "prioritises exact matches" do
       # find an exact match first
       results = search_for("mrB")
       expect(results.first.username).to eq(user1.username)
+    end
 
+    it "does not include self, staged or inactive" do
       # don't return inactive users
       results = search_for(inactive.username)
       expect(results).to be_blank

From 690db4fd361cc08f54ea2a4fa2352bf99d1287ef Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 24 Oct 2019 14:00:25 +0300
Subject: [PATCH 160/328] FIX: Show poll voters in Oneboxed posts. (#7768)

---
 .../discourse/widgets/post-cooked.js.es6      |  6 ++++
 .../initializers/extend-for-poll.js.es6       | 35 +++++++++++--------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index d434012b4b..3d55314f08 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -165,7 +165,13 @@ export default class PostCooked {
 
       ajax(`/posts/by_number/${topicId}/${postId}`)
         .then(result => {
+          const post = this.decoratorHelper.getModel();
+          const quotedPosts = post.quoted || {};
+          quotedPosts[result.id] = result;
+          post.set("quoted", quotedPosts);
+
           const div = $("<div class='expanded-quote'></div>");
+          div.data("post-id", result.id);
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
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 eec0662153..826c85e9a8 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -55,37 +55,44 @@ function initializePolls(api) {
 
   function attachPolls($elem, helper) {
     const $polls = $(".poll", $elem);
-    if (!$polls.length) {
+    if (!$polls.length || !helper) {
       return;
     }
 
-    if (!helper) {
-      return;
-    }
-
-    const post = helper.getModel();
+    let post = helper.getModel();
     api.preventCloak(post.id);
-    const votes = post.get("polls_votes") || {};
-
     post.pollsChanged();
 
-    const polls = post.get("pollsObject");
-    if (!polls) {
-      return;
-    }
+    const polls = post.pollsObject || {};
+    const votes = post.polls_votes || {};
 
     _interval = _interval || setInterval(rerender, 30000);
 
     $polls.each((idx, pollElem) => {
       const $poll = $(pollElem);
       const pollName = $poll.data("poll-name");
-      const poll = polls[pollName];
+      let poll = polls[pollName];
+      let vote = votes[pollName] || [];
+
+      const quotedId = $poll.parent(".expanded-quote").data("post-id");
+      if (quotedId) {
+        const quotedPost = post.quoted[quotedId];
+        if (quotedPost) {
+          post = Ember.Object.create(quotedPost);
+          poll = Ember.Object.create(
+            quotedPost.polls.find(p => p.name === pollName)
+          );
+          vote = quotedPost.polls_votes || {};
+          vote = vote[pollName] || [];
+        }
+      }
+
       if (poll) {
         const glue = new WidgetGlue("discourse-poll", register, {
           id: `${pollName}-${post.id}`,
           post,
           poll,
-          vote: votes[pollName] || []
+          vote
         });
         glue.appendTo(pollElem);
         _glued.push(glue);

From f5d6236ad2291cd506fbc65520aa1f2cfc94f79f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 24 Oct 2019 12:27:35 +0100
Subject: [PATCH 161/328] DEV: Use `before_all` to run code before
 prefabrication

Followup to e9897d295f7eef1be1bb7c414a2fc50c40df468f
---
 spec/models/user_search_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index f004a04637..4953a4e29a 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe UserSearch do
 
-  fab!(:indexer) { SearchIndexer.enable } # Enable before fab! topics/users
+  before_all { SearchIndexer.enable } # Enable for prefabrication
   before { SearchIndexer.enable } # Enable for each test
 
   fab!(:topic)     { Fabricate :topic }

From da5e9af10a049570347a2279a3b3b11277f1afae Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 24 Oct 2019 09:27:03 -0500
Subject: [PATCH 162/328] FEATURE: Add remembering topic list for group pms
 (#8235)

* FEATURE: Add remembering topic list for group pms

* added findOrResetCachedBy helper in topic-list

* Created cached-topic-list.js

* Update app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6

Co-Authored-By: Robin Ward <robin.ward@gmail.com>
---
 .../discourse/lib/cached-topic-list.js.es6       | 12 ++++++++++++
 .../routes/build-private-messages-route.js.es6   | 16 ++++------------
 .../user-private-messages-group-archive.js.es6   |  8 +++++---
 .../routes/user-private-messages-group.js.es6    |  8 +++++---
 4 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/cached-topic-list.js.es6

diff --git a/app/assets/javascripts/discourse/lib/cached-topic-list.js.es6 b/app/assets/javascripts/discourse/lib/cached-topic-list.js.es6
new file mode 100644
index 0000000000..78cd2c0c51
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/cached-topic-list.js.es6
@@ -0,0 +1,12 @@
+export function findOrResetCachedTopicList(session, filter) {
+  const lastTopicList = session.get("topicList");
+  if (lastTopicList && lastTopicList.filter === filter) {
+    return lastTopicList;
+  } else {
+    session.setProperties({
+      topicList: null,
+      topicListScrollPosition: null
+    });
+    return false;
+  }
+}
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.es6
index 820a41cf8d..751e8f8fd2 100644
--- a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
@@ -1,4 +1,5 @@
 import UserTopicListRoute from "discourse/routes/user-topic-list";
+import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
 
 // A helper to build a user topic list route
 export default (viewName, path, channel) => {
@@ -18,19 +19,10 @@ export default (viewName, path, channel) => {
     },
 
     model() {
-      const session = Discourse.Session.current();
-      let filter =
+      const filter =
         "topics/" + path + "/" + this.modelFor("user").get("username_lower");
-      let lastTopicList = session.get("topicList");
-      if (lastTopicList && lastTopicList.filter === filter) {
-        return lastTopicList;
-      } else {
-        session.setProperties({
-          topicList: null,
-          topicListScrollPosition: null
-        });
-        return this.store.findFiltered("topicList", { filter });
-      }
+      const lastTopicList = findOrResetCachedTopicList(this.session, filter);
+      return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
     },
 
     setupController() {
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.es6
index 0d37dac923..b8ae1b0581 100644
--- 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.es6
@@ -1,4 +1,5 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
+import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
 
 export default createPMRoute("groups", "private-messages-groups").extend({
   groupName: null,
@@ -16,9 +17,10 @@ export default createPMRoute("groups", "private-messages-groups").extend({
 
   model(params) {
     const username = this.modelFor("user").get("username_lower");
-    return this.store.findFiltered("topicList", {
-      filter: `topics/private-messages-group/${username}/${params.name}/archive`
-    });
+    const filter =
+      `topics/private-messages-group/${username}/${params.name}/archive`;
+    const lastTopicList = findOrResetCachedTopicList(this.session, filter);
+    return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
   },
 
   afterModel(model) {
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.es6
index cea1b022f4..5cb253c3b1 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
@@ -1,4 +1,5 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
+import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
 
 export default createPMRoute("groups", "private-messages-groups").extend({
   groupName: null,
@@ -11,9 +12,10 @@ export default createPMRoute("groups", "private-messages-groups").extend({
 
   model(params) {
     const username = this.modelFor("user").get("username_lower");
-    return this.store.findFiltered("topicList", {
-      filter: `topics/private-messages-group/${username}/${params.name}`
-    });
+    const filter =
+      `topics/private-messages-group/${username}/${params.name}`;
+    const lastTopicList = findOrResetCachedTopicList(this.session, filter);
+    return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
   },
 
   afterModel(model) {

From 9592ab57e0f101a095b28ae7207869da328df06b Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 24 Oct 2019 10:16:12 -0500
Subject: [PATCH 163/328] FIX: failing build with prettier (#8241)

---
 .../discourse/routes/build-private-messages-route.js.es6   | 4 +++-
 .../routes/user-private-messages-group-archive.js.es6      | 7 ++++---
 .../discourse/routes/user-private-messages-group.js.es6    | 7 ++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

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.es6
index 751e8f8fd2..7331705f8f 100644
--- a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
@@ -22,7 +22,9 @@ export default (viewName, path, channel) => {
       const filter =
         "topics/" + path + "/" + this.modelFor("user").get("username_lower");
       const lastTopicList = findOrResetCachedTopicList(this.session, filter);
-      return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
+      return lastTopicList
+        ? lastTopicList
+        : this.store.findFiltered("topicList", { filter });
     },
 
     setupController() {
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.es6
index b8ae1b0581..0aece428d2 100644
--- 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.es6
@@ -17,10 +17,11 @@ export default createPMRoute("groups", "private-messages-groups").extend({
 
   model(params) {
     const username = this.modelFor("user").get("username_lower");
-    const filter =
-      `topics/private-messages-group/${username}/${params.name}/archive`;
+    const filter = `topics/private-messages-group/${username}/${params.name}/archive`;
     const lastTopicList = findOrResetCachedTopicList(this.session, filter);
-    return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
+    return lastTopicList
+      ? lastTopicList
+      : this.store.findFiltered("topicList", { filter });
   },
 
   afterModel(model) {
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.es6
index 5cb253c3b1..971cb506cb 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
@@ -12,10 +12,11 @@ export default createPMRoute("groups", "private-messages-groups").extend({
 
   model(params) {
     const username = this.modelFor("user").get("username_lower");
-    const filter =
-      `topics/private-messages-group/${username}/${params.name}`;
+    const filter = `topics/private-messages-group/${username}/${params.name}`;
     const lastTopicList = findOrResetCachedTopicList(this.session, filter);
-    return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
+    return lastTopicList
+      ? lastTopicList
+      : this.store.findFiltered("topicList", { filter });
   },
 
   afterModel(model) {

From e4718f1910892ba2e35cd949683ec940eed5d8c9 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 24 Oct 2019 01:41:27 +0200
Subject: [PATCH 164/328] DEV: Update puppeteer

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a335185a05..4761adf6d2 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
     "pretender": "^1.6",
     "prettier": "^1.18.2",
-    "puppeteer": "1.16",
+    "puppeteer": "1.20",
     "qunit": "2.8.0",
     "route-recognizer": "^0.3.3",
     "sinon": "^7.2.5"
diff --git a/yarn.lock b/yarn.lock
index c0533e3dff..b325846c2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2360,10 +2360,10 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@1.16:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.16.0.tgz#4b763d9ff4e69a4bb7a031c3393534214d54f27e"
-  integrity sha512-7hcmbUw+6INffSPBdnO8KSjJRg2bLRoI7EeZMf5MHdV5kpyYMeoMR5w8AIiZbKIhYGwrXlbgvO7gFTsXNHShuQ==
+puppeteer@1.20:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.20.0.tgz#e3d267786f74e1d87cf2d15acc59177f471bbe38"
+  integrity sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==
   dependencies:
     debug "^4.1.0"
     extract-zip "^1.6.6"

From decbc9194da03686df33d074568942559b7c20f4 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 24 Oct 2019 01:42:26 +0200
Subject: [PATCH 165/328] DEV: Fix basic auth in smoke test

---
 test/smoke_test.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index 68ebfe9c97..f886962589 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -80,10 +80,9 @@ const path = require("path");
 
   if (process.env.AUTH_USER && process.env.AUTH_PASSWORD) {
     await exec("basic authentication", () => {
-      return page.setExtraHTTPHeaders({
-        Authorization: `Basic ${new Buffer(
-          `${process.env.AUTH_USER}:${process.env.AUTH_PASSWORD}`
-        ).toString("base64")}`
+      return page.authenticate({
+        username: process.env.AUTH_USER,
+        password: process.env.AUTH_PASSWORD
       });
     });
   }

From 452d541b74e0fdf8f77d15b0fc4e2d79addae480 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 24 Oct 2019 15:10:18 +0200
Subject: [PATCH 166/328] DEV: Add env variable to allow easier debugging of
 smoke tests

Set `DEBUG_NODE=1` when running `rake smoke:test` and use your favorite tool to debug the smoke tests. See https://nodejs.org/en/docs/guides/debugging-getting-started/ for more information.

The debugger will break at the beginning of the smoke tests when the env variable is set.
---
 lib/tasks/smoke_test.rake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake
index 70abebcc98..fd7c70529c 100644
--- a/lib/tasks/smoke_test.rake
+++ b/lib/tasks/smoke_test.rake
@@ -68,7 +68,12 @@ task "smoke:test" do
 
   results = +""
 
-  IO.popen("node #{Rails.root}/test/smoke_test.js #{url}").each do |line|
+  node_arguments = []
+  node_arguments << '--inspect-brk' if ENV["DEBUG_NODE"]
+  node_arguments << "#{Rails.root}/test/smoke_test.js"
+  node_arguments << url
+
+  IO.popen("node #{node_arguments.join(' ')}").each do |line|
     puts line
     results << line
   end

From d4d2cb124cd046d8d7f2612a30b68fb774299a8d Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 24 Oct 2019 17:51:47 +0200
Subject: [PATCH 167/328] DEV: Make smoke tests more reliable

---
 test/smoke_test.js | 130 ++++++++++++++++++++++++++-------------------
 1 file changed, 76 insertions(+), 54 deletions(-)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index f886962589..4d2d44aa40 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -16,8 +16,8 @@ const path = require("path");
 
 (async () => {
   const browser = await puppeteer.launch({
-    // when debugging localy setting headless to "false" can be very helpful
-    headless: true,
+    // when debugging localy setting the SHOW_BROWSER env variable can be very helpful
+    headless: process.env.SHOW_BROWSER === undefined,
     args: ["--disable-local-storage", "--no-sandbox"]
   });
   const page = await browser.newPage();
@@ -209,17 +209,19 @@ const path = require("path");
     });
 
     await exec("upload modal is open", () => {
-      let promise = page.waitForSelector("#filename-input", { visible: true });
+      return page.waitForSelector("#filename-input", { visible: true });
+    });
 
-      promise.then(() => {
-        return page.click(".d-modal-cancel");
+    await exec("upload modal closes", () => {
+      let promise = page.click(".d-modal-cancel");
+
+      promise = promise.then(() => {
+        return page.waitForSelector("#filename-input", { hidden: true });
       });
 
       return promise;
     });
 
-    await page.waitFor(1000);
-
     await exec("submit the topic", () => {
       return page.click(".submit-panel .create");
     });
@@ -250,78 +252,98 @@ const path = require("path");
       );
     });
 
-    await page.waitFor(5000);
+    await exec("submit the reply", () => {
+      let promise = page.click("#reply-control .create");
 
-    await exec("submit the topic", () => {
-      return page.click("#reply-control .create");
+      promise = promise.then(() => {
+        return page.waitForSelector("#reply-control.closed", {
+          visible: false
+        });
+      });
+
+      return promise;
     });
 
-    await assert(
-      "reply is created",
-      () => {
-        let promise = page.waitForSelector(".topic-post");
+    await assert("reply is created", () => {
+      let promise = page.waitForSelector(
+        ".topic-post:not(.staged) #post_2 .cooked",
+        {
+          visible: true
+        }
+      );
 
-        promise = promise.then(() => {
-          return page.evaluate(() => {
-            return document.querySelectorAll(".topic-post").length;
-          });
-        });
+      promise = promise.then(() => {
+        return page.waitForFunction(
+          "document.querySelector('#post_2 .cooked').innerText.includes('I can even write a reply')"
+        );
+      });
 
-        return promise;
-      },
-      output => {
-        return output === 2;
-      }
-    );
+      return promise;
+    });
 
-    await page.waitFor(1000);
+    await exec("wait a little bit", () => {
+      return page.waitFor(5000);
+    });
 
     await exec("open composer to edit first post", () => {
-      return page.click(".post-controls:first-of-type .edit");
+      let promise = page.evaluate(() => {
+        window.scrollTo(0, 0);
+      });
+
+      promise = promise.then(() => {
+        return page.click("#post_1 .post-controls .edit");
+      });
+
+      promise = promise.then(() => {
+        return page.waitForSelector("#reply-control .d-editor-input", {
+          visible: true
+        });
+      });
+
+      return promise;
     });
 
     await exec("update post raw in composer", () => {
-      let promise = page.waitForSelector("#reply-control .d-editor-input", {
-        visible: true
-      });
-
-      promise = promise.then(() => page.waitFor(5000));
+      let promise = page.waitFor(5000);
 
       promise = promise.then(() => {
-        const post = `I edited this post`;
-        return page.type("#reply-control .d-editor-input", post);
+        return page.type(
+          "#reply-control .d-editor-input",
+          "\n\nI edited this post"
+        );
       });
 
       return promise;
     });
 
     await exec("submit the edit", () => {
-      return page.click("#reply-control .create");
-    });
+      let promise = page.click("#reply-control .create");
 
-    await assert(
-      "reply is created",
-      () => {
-        let promise = page.waitForSelector("#reply-control.closed", {
+      promise = promise.then(() => {
+        return page.waitForSelector("#reply-control.closed", {
           visible: false
         });
+      });
 
-        promise = promise.then(() => {
-          return page.waitForSelector("#post_1", { visible: true });
-        });
+      return promise;
+    });
 
-        promise = promise.then(() => {
-          return page.evaluate(() => {
-            return document.querySelector("#post_1 .cooked").textContent;
-          });
-        });
+    await assert("edit is successful", () => {
+      let promise = page.waitForSelector(
+        ".topic-post:not(.staged) #post_1 .cooked",
+        {
+          visible: true
+        }
+      );
 
-        return promise;
-      },
-      output => {
-        return output.includes(`I edited this post`);
-      }
-    );
+      promise = promise.then(() => {
+        return page.waitForFunction(
+          "document.querySelector('#post_1 .cooked').innerText.includes('I edited this post')"
+        );
+      });
+
+      return promise;
+    });
   }
 
   await exec("close browser", () => {

From 85c08b84a578e6fc80582e1137e8bccd8e7f6cb6 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 24 Oct 2019 18:36:27 +0200
Subject: [PATCH 168/328] DEV: Add a short wait to smoke test to prevent rate
 limiting

---
 test/smoke_test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index 4d2d44aa40..81464046b4 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -252,6 +252,10 @@ const path = require("path");
       );
     });
 
+    await exec("wait a little bit", () => {
+      return page.waitFor(5000);
+    });
+
     await exec("submit the reply", () => {
       let promise = page.click("#reply-control .create");
 

From 2c0efac25eede4477b28e03be72aa9cc72b05e96 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 24 Oct 2019 12:37:33 -0400
Subject: [PATCH 169/328] FIX: Broken certificates

---
 .../discourse_narrative_bot/certificate_generator.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
index f5660854de..5e25bb851f 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
@@ -2,9 +2,9 @@
 
 module DiscourseNarrativeBot
   class CertificateGenerator
-    def initialize(user, date, avatar_url)
+    def initialize(user, date, avatar_data)
       @user = user
-      @avatar_url = avatar_url
+      @avatar_data = avatar_data
 
       date =
         begin
@@ -46,7 +46,7 @@ module DiscourseNarrativeBot
         width: width,
         discobot_user: @discobot_user,
         date: @date,
-        avatar_url: base64_image_link(@avatar_url),
+        avatar_url: base64_image_data(@avatar_data),
         logo_group: logo_group,
         name: name
       }
@@ -79,9 +79,13 @@ module DiscourseNarrativeBot
       end
     end
 
+    def base64_image_data(data)
+      "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(data)}\""
+    end
+
     def base64_image_link(url)
       if image = fetch_image(url)
-        "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(image)}\""
+        base64_image_data(image)
       else
         ""
       end

From 8b4e71cb212fbe34f9613b5b17f6cfb2016a959f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 24 Oct 2019 14:01:54 -0400
Subject: [PATCH 170/328] FIX: Allow avatar downloads to follow redirects

---
 plugins/discourse-narrative-bot/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 0c61b923b6..9b598a681f 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -108,7 +108,7 @@ after_initialize do
 
       def fetch_avatar_url(user)
         avatar_url = UrlHelper.absolute(Discourse.base_uri + user.avatar_template.gsub('{size}', '250'))
-        URI(avatar_url).open('rb', redirect: false).read
+        URI(avatar_url).open('rb', redirect: true, allow_redirections: :all).read
       rescue OpenURI::HTTPError
         # Ignore if fetching image returns a non 200 response
       end

From 7744b636e9e80c914847c7bf9405066ad3c23330 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 24 Oct 2019 14:02:51 -0400
Subject: [PATCH 171/328] FIX: Handle nil case for avatar, just in case

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

diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
index 5e25bb851f..411cf1c8a2 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
@@ -80,6 +80,7 @@ module DiscourseNarrativeBot
     end
 
     def base64_image_data(data)
+      return "" if data.blank?
       "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(data)}\""
     end
 

From 5d1b34e1b93469333100a78851614caf2d3d59c8 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Thu, 24 Oct 2019 11:16:31 -0700
Subject: [PATCH 172/328] Minor Copy Change

Context: https://meta.discourse.org/t/email-with-correct-incoming-email-address-in-bcc-is-being-rejected/131003/2
---
 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 61c5369303..9f3dd9b53b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -128,7 +128,7 @@ en:
         from_reply_by_address_error: "Happens when the From header matches the reply by email address."
         inactive_user_error: "Happens when the sender is not active."
         silenced_user_error: "Happens when the sender has been silenced."
-        bad_destination_address: "Happens when none of the email addresses in To/Cc/Bcc fields matched a configured incoming email address."
+        bad_destination_address: "Happens when none of the email addresses in To/Cc fields matched a configured incoming email address."
         strangers_not_allowed_error: "Happens when a user tried to create a new topic in a category they're not a member of."
         insufficient_trust_level_error: "Happens when a user tried to create a new topic in a category they don't have the required trust level for."
         reply_user_not_matching_error: "Happens when a reply came in from a different email address the notification was sent to."

From 7b04bb729024980f24f00ba74587ca829e005982 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 24 Oct 2019 16:47:54 -0400
Subject: [PATCH 173/328] Add event for when a post is flagged

This allows plugins to track events such as analytics.
---
 app/assets/javascripts/discourse/controllers/flag.js.es6 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index 99dee423d2..54ef36d306 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -155,6 +155,13 @@ export default Controller.extend(ModalFunctionality, {
         params = $.extend(params, opts);
       }
 
+      this.appEvents.trigger(
+        this.flagTopic ? "topic:flag-created" : "post:flag-created",
+        this.model,
+        postAction,
+        params
+      );
+
       this.send("hideModal");
 
       postAction

From ae108b363f97a16f2f8f86ee4dd01b63df6e8f25 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 25 Oct 2019 10:08:13 +1100
Subject: [PATCH 174/328] FIX: Hide muted subcategories (#8239)

That bug was mentioned in [meta](https://meta.discourse.org/t/muting-categories-hides-them-muting-subcategories-should-too/131316)

Problem is that subcategories are always visible in `/categories` path even if muted.

Categories/subcategories are loaded in at least two places
https://github.com/discourse/discourse/blob/master/app/assets/javascripts/discourse/models/site.js.es6#L146
https://github.com/discourse/discourse/blob/master/app/assets/javascripts/discourse/routes/discovery-categories.js.es6#L46

I discussed that with @jjaffeux and we thought that maybe it would be a good idea to filter that on frontend level
---
 .../javascripts/discourse/models/category.js.es6   |  6 ++++++
 .../templates/components/categories-only.hbs       | 14 ++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 8aa1f1e2c7..ee5101074c 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -3,6 +3,7 @@ import RestModel from "discourse/models/rest";
 import computed from "ember-addons/ember-computed-decorators";
 import { on } from "ember-addons/ember-computed-decorators";
 import PermissionType from "discourse/models/permission-type";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 const Category = RestModel.extend({
   permissions: null,
@@ -44,6 +45,11 @@ const Category = RestModel.extend({
     return { type: "category", id, category: this };
   },
 
+  @computed("notification_level")
+  isMuted(notificationLevel) {
+    return notificationLevel === NotificationLevels.MUTED;
+  },
+
   @computed("name")
   url() {
     return Discourse.getURL("/c/") + Category.slugFor(this);
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 4f93c8a316..762752097b 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -20,12 +20,14 @@
               </div>
                    {{#if c.subcategories}}
               <div class='subcategories'>
-                {{#each c.subcategories as |s|}}
-                  <span class='subcategory'>
-                    {{category-title-before category=s}}
-                    {{category-link s hideParent="true"}}
-                    {{category-unread category=s}}
-                  </span>
+                {{#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}}

From c9714fcbf8bec9abccd439483725db2537ce07b3 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 25 Oct 2019 11:17:44 +1100
Subject: [PATCH 175/328] FIX: update rack-mini-profiler

1.1.0 had regressions where rack mini profiler would break the site for IE11
users cause the payload had errors.

1.1.2 fixes that.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 960a04c35c..36c5f3279a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
     puma (3.12.1)
     r2 (0.2.7)
     rack (2.0.7)
-    rack-mini-profiler (1.1.0)
+    rack-mini-profiler (1.1.2)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)

From 5ae35f9906eef220d15a08a4eaedebd3d601e3d4 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 25 Oct 2019 11:57:34 +1100
Subject: [PATCH 176/328] FIX: allow storage of non unique rows in
 oauth2_user_infos

Certain DBs have duplicates already, if we want to ensure uniqueness here
we need to decide first how to clean up existing data and confirm all the
plugins expect this.
---
 app/models/oauth2_user_info.rb                           | 2 +-
 .../20191022155215_add_index_to_oauth2_user_info.rb      | 2 +-
 .../20191025005204_amend_oauth2_user_info_index.rb       | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20191025005204_amend_oauth2_user_info_index.rb

diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb
index 69f35ed731..285eb7a5c7 100644
--- a/app/models/oauth2_user_info.rb
+++ b/app/models/oauth2_user_info.rb
@@ -21,5 +21,5 @@ end
 # Indexes
 #
 #  index_oauth2_user_infos_on_uid_and_provider      (uid,provider) UNIQUE
-#  index_oauth2_user_infos_on_user_id_and_provider  (user_id,provider) UNIQUE
+#  index_oauth2_user_infos_on_user_id_and_provider  (user_id,provider)
 #
diff --git a/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb b/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb
index dc9093a6c0..4c330ddae4 100644
--- a/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb
+++ b/db/migrate/20191022155215_add_index_to_oauth2_user_info.rb
@@ -2,6 +2,6 @@
 
 class AddIndexToOauth2UserInfo < ActiveRecord::Migration[6.0]
   def change
-    add_index :oauth2_user_infos, [:user_id, :provider], unique: true
+    add_index :oauth2_user_infos, [:user_id, :provider]
   end
 end
diff --git a/db/migrate/20191025005204_amend_oauth2_user_info_index.rb b/db/migrate/20191025005204_amend_oauth2_user_info_index.rb
new file mode 100644
index 0000000000..15dcf001d3
--- /dev/null
+++ b/db/migrate/20191025005204_amend_oauth2_user_info_index.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AmendOauth2UserInfoIndex < ActiveRecord::Migration[6.0]
+  def up
+    # remove old index which may have been unique
+    execute "DROP INDEX index_oauth2_user_infos_on_user_id_and_provider"
+    add_index :oauth2_user_infos, [:user_id, :provider]
+  end
+end

From 070a3dcf9bf5013c0f925166e016d62be0e2a9d4 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 25 Oct 2019 09:29:51 -0300
Subject: [PATCH 177/328] FIX: When running the wizard and using a custom
 theme, fallback to the color_scheme name if the base_scheme_id is nil (#8236)

---
 app/models/color_scheme.rb                    |  4 ++++
 lib/wizard/builder.rb                         | 20 ++++++++++++-------
 spec/components/wizard/wizard_builder_spec.rb | 16 ++++++++++++++-
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index f69a96031c..0e6f7f7b23 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -187,6 +187,10 @@ class ColorScheme < ActiveRecord::Base
     @base_color_scheme
   end
 
+  def self.is_base?(scheme_name)
+    base_color_scheme_colors.map { |c| c[:id] }.include?(scheme_name)
+  end
+
   # create_from_base will create a new ColorScheme that overrides Discourse's base color scheme with the given colors.
   def self.create_from_base(params)
     new_color_scheme = new(name: params[:name])
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 210f0bd8e1..a8727bdde8 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -146,12 +146,10 @@ class Wizard
         default_theme = Theme.find_by(id: SiteSetting.default_theme_id)
         default_theme_override = SiteSetting.exists?(name: "default_theme_id")
 
-        scheme_id =
-          if default_theme_override
-            default_theme&.color_scheme&.base_scheme_id
-          else
-            ColorScheme::LIGHT_THEME_ID
-          end
+        base_scheme = default_theme&.color_scheme&.base_scheme_id
+        color_scheme_name = default_theme&.color_scheme&.name
+
+        scheme_id = default_theme_override ? (base_scheme || color_scheme_name) : ColorScheme::LIGHT_THEME_ID
 
         themes = step.add_field(
           id: 'theme_previews',
@@ -160,6 +158,14 @@ class Wizard
           value: scheme_id
         )
 
+        # fix for the case when base_scheme is nil
+        if scheme_id && default_theme_override && base_scheme.nil?
+          scheme = default_theme.color_scheme
+          default_colors = scheme.colors.select(:name, :hex)
+          choice_hash = default_colors.reduce({}) { |choice, color| choice[color.name] = "##{color.hex}"; choice }
+          themes.add_choice(scheme_id, data: { colors: choice_hash })
+        end
+
         ColorScheme.base_color_scheme_colors.each do |t|
           with_hash = t[:colors].dup
           with_hash.map { |k, v| with_hash[k] = "##{v}" }
@@ -172,7 +178,7 @@ class Wizard
             ColorScheme::LIGHT_THEME_ID
           )
 
-          next unless scheme_name.present?
+          next unless scheme_name.present? && ColorScheme.is_base?(scheme_name)
 
           name = I18n.t("color_schemes.#{scheme_name.downcase.gsub(' ', '_')}_theme_name")
 
diff --git a/spec/components/wizard/wizard_builder_spec.rb b/spec/components/wizard/wizard_builder_spec.rb
index 22230819e2..88cb9512f6 100644
--- a/spec/components/wizard/wizard_builder_spec.rb
+++ b/spec/components/wizard/wizard_builder_spec.rb
@@ -162,7 +162,21 @@ describe Wizard::Builder do
       end
     end
 
-    describe "when the default them hass been override" do
+    describe "when the default theme has been override and the color scheme doesn't have a base scheme" do
+      let(:color_scheme) { Fabricate(:color_scheme, base_scheme_id: nil) }
+
+      before do
+        SiteSetting.default_theme_id = theme.id
+        theme.update(color_scheme: color_scheme)
+      end
+
+      it 'fallbacks to the color scheme name' do
+        expect(field.required).to eq(false)
+        expect(field.value).to eq(color_scheme.name)
+      end
+    end
+
+    describe "when the default theme has been override" do
       before do
         theme.set_default!
       end

From 4f452f0205f1699dd1ff194b5792eb1a7b3f2847 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Fri, 25 Oct 2019 10:52:23 -0300
Subject: [PATCH 178/328] DEV: Add variable to warmup tmp folder and obtain
 accurate results when profiling specs

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

diff --git a/script/docker_test.rb b/script/docker_test.rb
index 445901b851..4c72bc6916 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -6,6 +6,7 @@
 # => COMMIT_HASH      used by the discourse_test docker image to load a specific commit of discourse
 #                     this can also be set to a branch, e.g. "origin/tests-passed"
 # => RUN_SMOKE_TESTS  executes the smoke tests instead of the regular tests from docker.rake
+# => WARMUP_TMP_FOLDER runs a single spec to warmup the tmp folder and obtain accurate results when profiling specs.
 # See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information
 
 puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"]
@@ -39,6 +40,10 @@ unless ENV['NO_UPDATE']
   puts "travis_fold:end:bundle" if ENV["TRAVIS"]
 end
 
+if ENV['WARMPUP_TMP_FOLDER']
+  run_or_fail('bundle exec rspec ./spec/requests/users_controller_spec.rb:222')
+end
+
 log("Running tests")
 if ENV['RUN_SMOKE_TESTS']
   run_or_fail("bundle exec rake smoke:test")

From d76d0e75ec7a08f930bb83ab4eb75856d04f01c7 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Fri, 25 Oct 2019 16:31:05 -0300
Subject: [PATCH 179/328] DEV: Move warmup inside docker rake task

---
 lib/tasks/docker.rake | 6 ++++++
 script/docker_test.rb | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 18007c9bdf..e3e9a19971 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -16,6 +16,7 @@
 # => RSPEC_SEED                set to seed to use for rspec tests (applies to core rspec tests only)
 # => PAUSE_ON_TERMINATE        set to 1 to pause prior to terminating redis and pg
 # => JS_TIMEOUT                set timeout for qunit tests in ms
+# => WARMUP_TMP_FOLDER runs a single spec to warmup the tmp folder and obtain accurate results when profiling specs.
 #
 # Other useful environment variables (not specific to this rake task)
 # => COMMIT_HASH    used by the discourse_test docker image to load a specific commit of discourse
@@ -143,6 +144,11 @@ task 'docker:test' do
 
       unless ENV["JS_ONLY"]
         puts "travis_fold:start:ruby_tests" if ENV["TRAVIS"]
+
+        if ENV['WARMUP_TMP_FOLDER']
+          run_or_fail('bundle exec rspec ./spec/requests/users_controller_spec.rb:222')
+        end
+
         unless ENV["SKIP_CORE"]
           params = []
 
diff --git a/script/docker_test.rb b/script/docker_test.rb
index 4c72bc6916..445901b851 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -6,7 +6,6 @@
 # => COMMIT_HASH      used by the discourse_test docker image to load a specific commit of discourse
 #                     this can also be set to a branch, e.g. "origin/tests-passed"
 # => RUN_SMOKE_TESTS  executes the smoke tests instead of the regular tests from docker.rake
-# => WARMUP_TMP_FOLDER runs a single spec to warmup the tmp folder and obtain accurate results when profiling specs.
 # See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information
 
 puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"]
@@ -40,10 +39,6 @@ unless ENV['NO_UPDATE']
   puts "travis_fold:end:bundle" if ENV["TRAVIS"]
 end
 
-if ENV['WARMPUP_TMP_FOLDER']
-  run_or_fail('bundle exec rspec ./spec/requests/users_controller_spec.rb:222')
-end
-
 log("Running tests")
 if ENV['RUN_SMOKE_TESTS']
   run_or_fail("bundle exec rake smoke:test")

From 4c2d6e19ba8ebdaefbfc4d506571eb6b404a9e72 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 25 Oct 2019 16:33:05 -0400
Subject: [PATCH 180/328] PERF: cache new users counts in summary emails

The query to count how many new users there are since a given date
is expensive. It's the least personalized stat and the one we fallback
to last when no better number can be found for the target user.
Give up accuracy so we can aggressively cache the user counts
that appear in this email.
---
 app/mailers/user_notifications.rb       | 18 ++++++++++++++++--
 spec/mailers/user_notifications_spec.rb | 17 +++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index a3450b00d6..3d2de7cb49 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -224,8 +224,8 @@ class UserNotifications < ActionMailer::Base
         @counts << { label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
       end
 
-      if @counts.size < 3
-        value = User.real.where(active: true, staged: false).not_suspended.where("created_at > ?", min_date).count
+      if @counts.size < 3 && user.user_option.digest_after_minutes >= 1440
+        value = summary_new_users_count(min_date)
         @counts << { label_key: 'user_notifications.digest.new_users', value: value, href: "#{Discourse.base_url}/about" } if value > 0
       end
 
@@ -676,4 +676,18 @@ class UserNotifications < ActionMailer::Base
     @unsubscribe_key = UnsubscribeKey.create_key_for(@user, "digest")
     @disable_email_custom_styles = !SiteSetting.apply_custom_styles_to_digest
   end
+
+  def self.summary_new_users_count_key(min_date_str)
+    "summary-new-users:#{min_date_str}"
+  end
+
+  def summary_new_users_count(min_date)
+    min_date_str = min_date.is_a?(String) ? min_date : min_date.strftime('%Y-%m-%d')
+    key = self.class.summary_new_users_count_key(min_date_str)
+    ((count = $redis.get(key)) && count.to_i) || begin
+      count = User.real.where(active: true, staged: false).not_suspended.where("created_at > ?", min_date_str).count
+      $redis.setex(key, 1.day, count)
+      count
+    end
+  end
 end
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index f0640a0335..34cffcbe58 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -107,6 +107,10 @@ describe UserNotifications do
 
     subject { UserNotifications.digest(user) }
 
+    after do
+      $redis.keys('summary-new-users:*').each { |key| $redis.del(key) }
+    end
+
     context "without new topics" do
 
       it "doesn't send the email" do
@@ -138,6 +142,19 @@ describe UserNotifications do
         expect(subject.html_part.body.to_s).to be_present
         expect(subject.text_part.body.to_s).to be_present
         expect(subject.header["List-Unsubscribe"].to_s).to match(/\/email\/unsubscribe\/\h{64}/)
+        expect(subject.html_part.body.to_s).to include('New Users')
+      end
+
+      it "doesn't include new user count if digest_after_minutes is low" do
+        user.user_option.digest_after_minutes = 60
+        expect(subject.html_part.body.to_s).to_not include('New Users')
+      end
+
+      it "works with min_date string" do
+        digest = UserNotifications.digest(user, since: 1.month.ago.to_date.to_s)
+        expect(digest.html_part.body.to_s).to be_present
+        expect(digest.text_part.body.to_s).to be_present
+        expect(digest.html_part.body.to_s).to include('New Users')
       end
 
       it "includes email_prefix in email subject instead of site title" do

From 8ca5aad1e2b1612c2ef6824bd574eea9ef71d30d Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Sat, 26 Oct 2019 12:55:54 +0300
Subject: [PATCH 181/328] FIX: Reload plugin translations in development
 (#8243)

The default locale is :en_US, which is just a thin layer over :en. In
other words, :en_US has the :en locale as a fallback. When "en.yml" is
edited, only the :en locale is refreshed and :en_US becomes stale.

This commit ensures that there is a dependency on the fallback locales
too.
---
 lib/js_locale_helper.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 52a6c93d30..798a67fe87 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -6,10 +6,12 @@ module JsLocaleHelper
     Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"]
   end
 
-  def self.reloadable_plugins(locale, ctx)
+  def self.reloadable_plugins(locale_sym, ctx)
     return unless Rails.env.development?
-    plugin_client_files(locale.to_s).each do |file|
-      ctx.depend_on(file)
+    I18n.fallbacks[locale_sym].each do |locale|
+      plugin_client_files(locale.to_s).each do |file|
+        ctx.depend_on(file)
+      end
     end
   end
 

From 3d85cc1e69660d3a2e0365881f9ab787f0e0abec Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 28 Oct 2019 11:14:52 +1100
Subject: [PATCH 182/328] PERF: run expensive clean up uploads less frequently

Previously every hour we would run a full scan of the entire DB searching
for expired uploads that need to be moved to the tombstone folder.

This commit amends it so we only run the job 2 times per clean_orpha_uploads_grace_period_hours

There is a upper bound of 7 days so even if the grace period is set really
high it will still run at least once a week.

By default we have a 48 grace period so this amends it to run this cleanup
daily instead of hourly. This eliminates 23 times we run this ultra expensive
query.
---
 app/jobs/scheduled/clean_up_uploads.rb | 26 +++++++++++
 spec/jobs/clean_up_uploads_spec.rb     | 63 +++++++++++++++++++-------
 2 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 97af8b0240..08e8aeb2a2 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -17,6 +17,10 @@ module Jobs
 
       return unless SiteSetting.clean_up_uploads?
 
+      if c = last_cleanup
+        return if (Time.zone.now.to_i - c) < (grace_period / 2).hours
+      end
+
       base_url = Discourse.store.internal? ? Discourse.store.relative_base_url : Discourse.store.absolute_base_url
       s3_hostname = URI.parse(base_url).hostname
       s3_cdn_hostname = URI.parse(SiteSetting.Upload.s3_cdn_url || "").hostname
@@ -87,6 +91,28 @@ module Jobs
           upload.delete
         end
       end
+
+      self.last_cleanup = Time.zone.now.to_i
     end
+
+    def last_cleanup=(v)
+      $redis.setex(last_cleanup_key, 7.days.to_i, v.to_s)
+    end
+
+    def last_cleanup
+      v = $redis.get(last_cleanup_key)
+      v ? v.to_i : v
+    end
+
+    def reset_last_cleanup!
+      $redis.del(last_cleanup_key)
+    end
+
+    protected
+
+    def last_cleanup_key
+      "LAST_UPLOAD_CLEANUP"
+    end
+
   end
 end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 2626aad980..efba2d8727 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -8,10 +8,39 @@ describe Jobs::CleanUpUploads do
     Fabricate(:upload, { created_at: 2.hours.ago }.merge(attributes))
   end
 
+  fab! :expired_upload do
+    fabricate_upload
+  end
+
   before do
     SiteSetting.clean_up_uploads = true
     SiteSetting.clean_orphan_uploads_grace_period_hours = 1
-    @upload = fabricate_upload
+
+    # pre-fabrication resets created_at, so re-expire the upload
+    expired_upload
+    freeze_time 2.hours.from_now
+
+    Jobs::CleanUpUploads.new.reset_last_cleanup!
+  end
+
+  it "only runs upload cleanup every grace period / 2 time" do
+
+    SiteSetting.clean_orphan_uploads_grace_period_hours = 48
+    expired = fabricate_upload(created_at: 49.hours.ago)
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.exists?(id: expired.id)).to eq(false)
+
+    upload = fabricate_upload(created_at: 72.hours.ago)
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.exists?(id: upload.id)).to eq(true)
+
+    freeze_time 25.hours.from_now
+
+    Jobs::CleanUpUploads.new.execute(nil)
+    expect(Upload.exists?(id: upload.id)).to eq(false)
+
   end
 
   it "deletes orphan uploads" do
@@ -19,7 +48,7 @@ describe Jobs::CleanUpUploads do
       Jobs::CleanUpUploads.new.execute(nil)
     end.to change { Upload.count }.by(-1)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
   end
 
   describe 'when clean_up_uploads is disabled' do
@@ -37,7 +66,7 @@ describe Jobs::CleanUpUploads do
         Jobs::CleanUpUploads.new.execute(nil)
       end.to change { Upload.count }.by(-1)
 
-      expect(Upload.exists?(id: @upload.id)).to eq(true)
+      expect(Upload.exists?(id: expired_upload.id)).to eq(true)
       expect(Upload.exists?(id: upload2.id)).to eq(false)
     end
   end
@@ -126,7 +155,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: logo_upload.id)).to eq(true)
     expect(Upload.exists?(id: logo_small_upload.id)).to eq(true)
     expect(Upload.exists?(id: digest_logo_upload.id)).to eq(true)
@@ -148,7 +177,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: logo_small_upload.id)).to eq(true)
   end
 
@@ -158,7 +187,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: profile_background_upload.id)).to eq(true)
   end
 
@@ -168,7 +197,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: card_background_upload.id)).to eq(true)
   end
 
@@ -178,7 +207,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: category_logo_upload.id)).to eq(true)
   end
 
@@ -188,7 +217,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: category_logo_upload.id)).to eq(true)
   end
 
@@ -198,7 +227,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
@@ -208,7 +237,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
@@ -218,7 +247,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
@@ -228,7 +257,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
@@ -250,7 +279,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
     expect(Upload.exists?(id: upload2.id)).to eq(true)
     expect(Upload.exists?(id: upload3.id)).to eq(false)
@@ -264,7 +293,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
     expect(Upload.exists?(id: upload2.id)).to eq(true)
   end
@@ -275,7 +304,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
@@ -285,7 +314,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: csv_file.id)).to eq(true)
   end
 end

From af841fa8833545114f320a5fddbadb861792457d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 28 Oct 2019 16:46:13 +1100
Subject: [PATCH 183/328] DEV: update rack-mini-profiler

This includes an important new feature, we pre-compile templates so CSPs
that disable eval can still apply to our sites.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 36c5f3279a..f6f45cd9e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
     puma (3.12.1)
     r2 (0.2.7)
     rack (2.0.7)
-    rack-mini-profiler (1.1.2)
+    rack-mini-profiler (1.1.3)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)

From 88df84bf2b71b621b9e7b9a52214cc74b7917587 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 28 Oct 2019 10:33:31 +0100
Subject: [PATCH 184/328] FIX: theme component setting was not getting updated
 in the UI (#8247)

---
 .../components/theme-setting-editor.js.es6    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6 b/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
index 292356d55a..a99b819466 100644
--- a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
+++ b/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
@@ -6,13 +6,16 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend(BufferedContent, SettingComponent, {
   layoutName: "admin/templates/components/site-setting",
-  _save() {
-    return ajax(`/admin/themes/${this.model.id}/setting`, {
-      type: "PUT",
-      data: {
-        name: this.setting.setting,
-        value: this.get("buffered.value")
-      }
-    }).catch(popupAjaxError);
+
+  _save(callback) {
+    callback(
+      ajax(`/admin/themes/${this.model.id}/setting`, {
+        type: "PUT",
+        data: {
+          name: this.setting.setting,
+          value: this.get("buffered.value")
+        }
+      }).catch(popupAjaxError)
+    );
   }
 });

From eec464d8d1c058e60b25348612542282f2da4180 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 24 Oct 2019 13:23:19 +0100
Subject: [PATCH 185/328] SECURITY: Check permissions when autocompleting
 mentions

---
 app/models/user_search.rb       | 28 +++++++----
 lib/guardian.rb                 |  9 ++++
 spec/models/user_search_spec.rb | 88 ++++++++++++++++++++++++---------
 3 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index ffb23e46f9..447f5d4492 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -16,7 +16,9 @@ class UserSearch
     @limit = opts[:limit] || 20
     @groups = opts[:groups]
     @guardian = Guardian.new(@searching_user)
-    @guardian.ensure_can_see_groups!(@groups) if @groups
+    @guardian.ensure_can_see_groups_members! @groups if @groups
+    @guardian.ensure_can_see_category! Category.find(@category_id) if @category_id
+    @guardian.ensure_can_see_topic! Topic.find(@topic_id) if @topic_id
   end
 
   def scoped_users
@@ -117,18 +119,26 @@ class UserSearch
 
     # 3. category matches
     if secure_category_id
+      @searching_user.present?
+
+      category_groups = Group.where(<<~SQL, secure_category_id, MAX_SIZE_PRIORITY_MENTION)
+        groups.id IN (
+          SELECT group_id FROM category_groups
+          JOIN groups g ON group_id = g.id
+          WHERE
+            category_id = ? AND
+            user_count < ?
+        )
+      SQL
+
+      category_groups = category_groups.members_visible_groups(@searching_user)
+
       in_category = filtered_by_term_users
-        .where(<<~SQL, secure_category_id, MAX_SIZE_PRIORITY_MENTION)
+        .where(<<~SQL, category_groups.pluck(:id))
           users.id IN (
             SELECT gu.user_id
             FROM group_users gu
-            WHERE group_id IN (
-              SELECT group_id FROM category_groups
-              JOIN groups g ON group_id = g.id
-              WHERE
-                category_id = ? AND
-                user_count < ?
-            )
+            WHERE group_id IN (?)
             LIMIT 200
           )
           SQL
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 41a93f5fee..b89f2c6a82 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -249,6 +249,15 @@ class Guardian
     true
   end
 
+  def can_see_groups_members?(groups)
+    return false if groups.blank?
+
+    requested_group_ids = groups.map(&:id) # Can't use pluck, groups could be a regular array
+    matching_groups = Group.where(id: requested_group_ids).members_visible_groups(user)
+
+    matching_groups.pluck(:id).sort == requested_group_ids.sort
+  end
+
   # Can we impersonate this user?
   def can_impersonate?(target)
     target &&
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index 4953a4e29a..5dad83c32b 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -26,36 +26,57 @@ describe UserSearch do
     UserSearch.new(*args).search
   end
 
-  it 'finds users in secure category' do
-    group = Fabricate(:group)
-    user = Fabricate(:user)
-    group.add(user)
-    group.save
+  context 'with a secure category' do
+    fab!(:group) { Fabricate :group }
+    fab!(:user) { Fabricate :user }
+    fab!(:searching_user) { Fabricate :user }
+    before_all do
+      group.add(user)
+      group.add(searching_user)
+      group.save
+    end
+    fab!(:category) { Fabricate(:category,
+                        read_restricted: true,
+                        user: user)
+    }
+    before_all { Fabricate(:category_group, category: category, group: group) }
 
-    category =
-      Fabricate(
-        :category,
-        read_restricted: true,
-        user: user
+    it 'autocompletes with people in the category' do
+      results = search_for("", searching_user: searching_user, category_id: category.id)
+
+      expect(user.username).to eq(results[0].username)
+      expect(results.length).to eq(1)
+    end
+
+    it 'will lookup the category from the topic id' do
+      topic = Fabricate(:topic, category: category)
+      _post = Fabricate(:post, user: topic.user, topic: topic)
+
+      results = search_for("", searching_user: searching_user, topic_id: topic.id)
+
+      expect(results.length).to eq(2)
+
+      expect(results.map(&:username)).to contain_exactly(
+        user.username, topic.user.username
       )
+    end
 
-    Fabricate(:category_group, category: category, group: group)
+    it 'will raise an error if the user cannot see the category' do
+      expect do
+        search_for("", searching_user: Fabricate(:user), category_id: category.id)
+      end.to raise_error(Discourse::InvalidAccess)
+    end
 
-    results = search_for("", category_id: category.id)
+    it 'will respect the group member visibility setting' do
+      group.update(members_visibility_level: Group.visibility_levels[:owners])
+      results = search_for("", searching_user: searching_user, category_id: category.id)
+      expect(results.length).to eq(0)
 
-    expect(user.username).to eq(results[0].username)
-    expect(results.length).to eq(1)
+      group.add_owner(searching_user)
+      results = search_for("", searching_user: searching_user, category_id: category.id)
+      expect(results.length).to eq(1)
+    end
 
-    topic = Fabricate(:topic, category: category)
-    _post = Fabricate(:post, user: topic.user, topic: topic)
-
-    results = search_for("", topic_id: topic.id)
-
-    expect(results.length).to eq(2)
-
-    expect(results.map(&:username)).to contain_exactly(
-      user.username, topic.user.username
-    )
   end
 
   it 'allows for correct underscore searching' do
@@ -156,6 +177,25 @@ describe UserSearch do
       expect(results[1]).to eq(user5)
     end
 
+    it "only reveals topic participants to people with permission" do
+      pm_topic = Fabricate(:private_message_post).topic
+
+      # Anonymous, does not have access
+      expect do
+        search_for("", topic_id: pm_topic.id)
+      end.to raise_error(Discourse::InvalidAccess)
+
+      # Random user, does not have access
+      expect do
+        search_for("", topic_id: pm_topic.id, searching_user: user1)
+      end.to raise_error(Discourse::InvalidAccess)
+
+      pm_topic.invite(pm_topic.user, user1.username)
+      results = search_for("", topic_id: pm_topic.id, searching_user: user1)
+      expect(results.length).to eq(1)
+      expect(results[0]).to eq(pm_topic.user)
+    end
+
     it "only searches by name when enabled" do
       # When searching by name is enabled, it returns the record
       SiteSetting.enable_names = true

From f0617f96ed9e185be7100f07c234cf946681032e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 28 Oct 2019 12:32:56 +0000
Subject: [PATCH 186/328] DEV: Update users controller spec following
 user_search update

---
 spec/requests/users_controller_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index bce87943f5..63bb8279a2 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3079,8 +3079,10 @@ describe UsersController do
     end
 
     it "searches only for users who have access to private topic" do
+      searching_user = Fabricate(:user)
       privileged_user = Fabricate(:user, trust_level: 4, username: "joecabit", name: "Lawrence Tierney")
       privileged_group = Fabricate(:group)
+      privileged_group.add(searching_user)
       privileged_group.add(privileged_user)
       privileged_group.save
 
@@ -3090,6 +3092,7 @@ describe UsersController do
 
       private_topic = Fabricate(:topic, category: category)
 
+      sign_in(searching_user)
       get "/u/search/users.json", params: {
         term: user.name.split(" ").last, topic_id: private_topic.id, topic_allowed_users: "true"
       }

From 6de49b88dfdc1f06692c91ab2f68b4bc8e7b3657 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 28 Oct 2019 13:18:47 +0000
Subject: [PATCH 187/328] FIX: Respond to user search correctly when
 category_id is blank

Previously it would search for category_id=0, which does not exist. With the new permission checks, this returns a 404
---
 app/controllers/users_controller.rb    | 3 +--
 spec/requests/users_controller_spec.rb | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a696aa4ab1..8d8386fa1f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -921,8 +921,7 @@ class UsersController < ApplicationController
     topic_id = params[:topic_id]
     topic_id = topic_id.to_i if topic_id
 
-    category_id = params[:category_id]
-    category_id = category_id.to_i if category_id
+    category_id = params[:category_id].to_i if category_id.present?
 
     topic_allowed_users = params[:topic_allowed_users] || false
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 63bb8279a2..0d454970f3 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3103,6 +3103,15 @@ describe UsersController do
       expect(json["users"].map { |u| u["username"] }).to include(privileged_user.username)
     end
 
+    it "interprets blank category id correctly" do
+      pm_topic = Fabricate(:private_message_post).topic
+      sign_in(pm_topic.user)
+      get "/u/search/users.json", params: {
+        term: "", topic_id: pm_topic.id, category_id: ""
+      }
+      expect(response.status).to eq(200)
+    end
+
     context "when `enable_names` is true" do
       before do
         SiteSetting.enable_names = true

From 437edfc4157aac4d9a50d911bca550d4425193cf Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Mon, 28 Oct 2019 08:58:45 -0500
Subject: [PATCH 188/328] FEATURE: Welcome moderator message - add copy!
 (#8246)

---
 app/models/concerns/roleable.rb | 1 +
 app/models/user.rb              | 5 +++++
 config/locales/server.en.yml    | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/app/models/concerns/roleable.rb b/app/models/concerns/roleable.rb
index 8659809226..0706269240 100644
--- a/app/models/concerns/roleable.rb
+++ b/app/models/concerns/roleable.rb
@@ -20,6 +20,7 @@ module Roleable
 
   def grant_moderation!
     set_permission('moderator', true)
+    enqueue_welcome_moderator_message
   end
 
   def revoke_moderation!
diff --git a/app/models/user.rb b/app/models/user.rb
index 2a8a55f595..9b27e1665b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -415,6 +415,11 @@ class User < ActiveRecord::Base
     Jobs.enqueue(:send_system_message, user_id: id, message_type: "welcome_tl1_user")
   end
 
+  def enqueue_welcome_moderator_message
+    return unless moderator
+    Jobs.enqueue(:send_system_message, user_id: id, message_type: 'welcome_moderator')
+  end
+
   def change_username(new_username, actor = nil)
     UsernameChanger.change(self, new_username, actor)
   end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9f3dd9b53b..2209536a1b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2659,6 +2659,13 @@ en:
 
         We’re really glad you’re spending time with us and we’d love to know more about you. Take a moment to [fill out your profile](%{base_url}/my/preferences/profile), or feel free to [start a new topic](%{base_url}/categories).
 
+    welcome_moderator:
+      title: "Welcome Moderator"
+      subject_template: "Congratulations on becoming a moderator!"
+      text_body_template: |
+        You are now a moderator. -- congratulations!
+
+        You now have access to the <a href='%{base_url}/admin' target='_blank'>admin interface</a>
     welcome_invite:
       title: "Welcome Invite"
       subject_template: "Welcome to %{site_name}!"

From 790e1b7191c403a6d8dafe0efffdc230e8525bc9 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 28 Oct 2019 15:20:27 +0000
Subject: [PATCH 189/328] FIX: TopicQuery category lookup by slug

If we are searching for categories by their slugs, it doesn't make sense
to include subcategories since a slug, by itself, does not necessarily
uniquely identify a subcategory.

Similarly, the empty string as a slug is not a good category identifier.
---
 lib/topic_query.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 1982ed133e..5060180889 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -640,9 +640,16 @@ class TopicQuery
   end
 
   def get_category_id(category_id_or_slug)
-    return nil unless category_id_or_slug
+    return nil unless category_id_or_slug.present?
     category_id = category_id_or_slug.to_i
-    category_id = Category.where(slug: category_id_or_slug).pluck_first(:id) if category_id == 0
+
+    if category_id == 0
+      category_id =
+        Category
+          .where(slug: category_id_or_slug, parent_category_id: nil)
+          .pluck_first(:id)
+    end
+
     category_id
   end
 

From 5776251cdd64317d58cbf56a4946db052ae3ac93 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 28 Oct 2019 17:29:14 +0100
Subject: [PATCH 190/328] DEV: Remove an obsolete "preferences/about-me" route
 (#8251)

User's title and bio can be changed on the "preferences/account" page.
---
 .../controllers/preferences/about.js.es6      | 12 -----
 .../discourse/routes/app-route-map.js.es6     |  1 -
 .../discourse/routes/preferences-about.js.es6 | 46 -------------------
 .../discourse/templates/preferences-about.hbs | 25 ----------
 config/routes.rb                              |  1 -
 .../acceptance/preferences-test.js.es6        |  5 --
 6 files changed, 90 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/controllers/preferences/about.js.es6
 delete mode 100644 app/assets/javascripts/discourse/routes/preferences-about.js.es6
 delete mode 100644 app/assets/javascripts/discourse/templates/preferences-about.hbs

diff --git a/app/assets/javascripts/discourse/controllers/preferences/about.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
deleted file mode 100644
index ec9958c1fc..0000000000
--- a/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-import Controller from "@ember/controller";
-import computed from "ember-addons/ember-computed-decorators";
-
-export default Controller.extend({
-  saving: false,
-  newBio: null,
-
-  @computed("saving")
-  saveButtonText(saving) {
-    return saving ? I18n.t("saving") : I18n.t("user.change");
-  }
-});
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 654c683a45..d29d77463b 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -156,7 +156,6 @@ export default function() {
         this.route("email");
         this.route("second-factor");
         this.route("second-factor-backup");
-        this.route("about", { path: "/about-me" });
       });
 
       this.route(
diff --git a/app/assets/javascripts/discourse/routes/preferences-about.js.es6 b/app/assets/javascripts/discourse/routes/preferences-about.js.es6
deleted file mode 100644
index d6e29ec781..0000000000
--- a/app/assets/javascripts/discourse/routes/preferences-about.js.es6
+++ /dev/null
@@ -1,46 +0,0 @@
-import RestrictedUserRoute from "discourse/routes/restricted-user";
-
-export default RestrictedUserRoute.extend({
-  showFooter: true,
-
-  model: function() {
-    return this.modelFor("user");
-  },
-
-  renderTemplate: function() {
-    this.render({ into: "user" });
-  },
-
-  setupController: function(controller, model) {
-    controller.setProperties({ model, newBio: model.get("bio_raw") });
-  },
-
-  // A bit odd, but if we leave to /preferences we need to re-render that outlet
-  deactivate: function() {
-    this._super(...arguments);
-    this.render("preferences", { into: "user", controller: "preferences" });
-  },
-
-  actions: {
-    changeAbout: function() {
-      var route = this;
-      var controller = route.controllerFor("preferences/about");
-
-      controller.setProperties({ saving: true });
-      return controller
-        .get("model")
-        .save()
-        .then(
-          function() {
-            controller.set("saving", false);
-            route.transitionTo("user.index");
-          },
-          function() {
-            // model failed to save
-            controller.set("saving", false);
-            bootbox.alert(I18n.t("generic_error"));
-          }
-        );
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/templates/preferences-about.hbs b/app/assets/javascripts/discourse/templates/preferences-about.hbs
deleted file mode 100644
index a409979d95..0000000000
--- a/app/assets/javascripts/discourse/templates/preferences-about.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="user-preferences solo-preference">
-  <form class="form-horizontal">
-
-    <div class="control-group">
-      <div class="controls">
-        <h3>{{i18n 'user.change_about.title'}}</h3>
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label class="control-label">{{i18n 'user.bio'}}</label>
-      <div class="controls">
-        {{d-editor value=model.bio_raw class="raw-bio" autofocus="autofocus"}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        {{#d-button action=(route-action "changeAbout") class="btn btn-primary"}}
-          {{saveButtonText}}
-        {{/d-button}}
-      </div>
-    </div>
-  </form>
-</div>
diff --git a/config/routes.rb b/config/routes.rb
index 290282be38..7e5fd73d08 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -435,7 +435,6 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: { username: RouteFormat.username }
     put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/about-me" => "users#preferences", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: { username: RouteFormat.username }
     put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: RouteFormat.username }
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 373a49cddf..e2d55d20bc 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -160,11 +160,6 @@ QUnit.test("username", async assert => {
   assert.ok(exists("#change_username"), "it has the input element");
 });
 
-QUnit.test("about me", async assert => {
-  await visit("/u/eviltrout/preferences/about-me");
-  assert.ok(exists(".raw-bio"), "it has the input element");
-});
-
 QUnit.test("email", async assert => {
   await visit("/u/eviltrout/preferences/email");
 

From e7ff6809a39bbaafb5d0b88b23ec330f5233ccf4 Mon Sep 17 00:00:00 2001
From: Leo McArdle <lmcardle@mozilla.com>
Date: Mon, 28 Oct 2019 16:46:53 +0000
Subject: [PATCH 191/328] FEATURE: add SES spam header to recognised spam
 headers (#8254)

---
 config/site_settings.yml                         |  1 +
 lib/email/receiver.rb                            |  2 ++
 spec/components/email/receiver_spec.rb           | 15 +++++++++++++++
 spec/fixtures/emails/spam_x_ses_spam_verdict.eml | 12 ++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 spec/fixtures/emails/spam_x_ses_spam_verdict.eml

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6a44f4b609..ce1fe16575 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -969,6 +969,7 @@ email:
       - none
       - X-Spam-Flag
       - X-Spam-Status
+      - X-SES-Spam-Verdict
   email_prefix: ""
   email_site_title: ""
   disable_emails:
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 724adc06ab..eb78a0ef01 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -301,6 +301,8 @@ module Email
         @mail[:x_spam_flag].to_s[/YES/i]
       when 'X-Spam-Status'
         @mail[:x_spam_status].to_s[/^Yes, /i]
+      when 'X-SES-Spam-Verdict'
+        @mail[:x_ses_spam_verdict].to_s[/FAIL/i]
       else
         false
       end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index f563a7b8d9..811fc3839c 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -1006,6 +1006,21 @@ describe Email::Receiver do
       expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:email_spam_header_found])
     end
 
+    it "creates hidden topic for X-SES-Spam-Verdict" do
+      SiteSetting.email_in_spam_header = 'X-SES-Spam-Verdict'
+
+      Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
+      expect { process(:spam_x_ses_spam_verdict) }.to change { Topic.count }.by(1) # Topic created
+
+      topic = Topic.last
+      expect(topic.visible).to eq(false)
+
+      post = Post.last
+      expect(post.hidden).to eq(true)
+      expect(post.hidden_at).not_to eq(nil)
+      expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:email_spam_header_found])
+    end
+
     it "adds the 'elided' part of the original message when always_show_trimmed_content is enabled" do
       SiteSetting.always_show_trimmed_content = true
 
diff --git a/spec/fixtures/emails/spam_x_ses_spam_verdict.eml b/spec/fixtures/emails/spam_x_ses_spam_verdict.eml
new file mode 100644
index 0000000000..58f3425721
--- /dev/null
+++ b/spec/fixtures/emails/spam_x_ses_spam_verdict.eml
@@ -0,0 +1,12 @@
+Return-Path: <existing@bar.com>
+From: Foo Bar <existing@bar.com>
+To: category@bar.com
+Subject: This is a topic from an existing user
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <32@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+X-SES-Spam-Verdict: FAIL
+
+Hey, this is a topic from an existing user ;)

From 0e1c5c6bbab1bda2e7226c1f02ee95ec1f985424 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 28 Oct 2019 16:11:03 +0000
Subject: [PATCH 192/328] FIX: Prefer Category.find_by_slug over
 Category.find_by(slug: ...)

It handles encoded slugs properly and ignores subcategories.
---
 app/controllers/categories_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index c20c08bcac..fafa90948e 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -327,7 +327,7 @@ class CategoriesController < ApplicationController
   end
 
   def fetch_category
-    @category = Category.find_by(slug: params[:id]) || Category.find_by(id: params[:id].to_i)
+    @category = Category.find_by_slug(params[:id]) || Category.find_by(id: params[:id].to_i)
   end
 
   def initialize_staff_action_logger

From 4eb54f08b29a13b2a5653a4df5050c1ca07d2190 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 28 Oct 2019 12:46:27 -0500
Subject: [PATCH 193/328] FEATURE: Site setting/UI to allow users to set their
 primary group (#8244)

* FEATURE: Site setting/ui to allow users to set their primary group

* prettier and remove logic from account template

* added 1 to 43 to make web_hook_user_serializer_spec pass
---
 .../controllers/preferences/account.js.es6    | 14 ++++++--
 .../javascripts/discourse/models/user.js.es6  |  3 +-
 .../routes/preferences-account.js.es6         |  3 +-
 .../templates/preferences/account.hbs         | 13 ++++++++
 app/controllers/users_controller.rb           |  3 +-
 app/serializers/user_serializer.rb            |  1 +
 app/services/user_updater.rb                  |  8 +++++
 config/locales/client.en.yml                  |  3 ++
 config/locales/server.en.yml                  |  2 ++
 config/site_settings.yml                      |  3 ++
 lib/guardian.rb                               |  8 +++++
 spec/components/guardian_spec.rb              | 33 +++++++++++++++++++
 .../web_hook_user_serializer_spec.rb          |  2 +-
 spec/services/user_updater_spec.rb            | 25 ++++++++++++++
 14 files changed, 115 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index a5b9e098a5..732c51ea73 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -17,7 +17,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
   init() {
     this._super(...arguments);
 
-    this.saveAttrNames = ["name", "title"];
+    this.saveAttrNames = ["name", "title", "primary_group_id"];
     this.set("revoking", {});
   },
 
@@ -26,6 +26,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
 
   newNameInput: null,
   newTitleInput: null,
+  newPrimaryGroupInput: null,
 
   passwordProgress: null,
 
@@ -55,6 +56,14 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
 
   canSelectTitle: Ember.computed.gt("model.availableTitles.length", 0),
 
+  @computed("model.filteredGroups")
+  canSelectPrimaryGroup(primaryGroupOptions) {
+    return (
+      primaryGroupOptions.length > 0 &&
+      this.siteSettings.user_selected_primary_groups
+    );
+  },
+
   @computed("model.is_anonymous")
   canChangePassword(isAnonymous) {
     if (isAnonymous) {
@@ -131,7 +140,8 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
 
       this.model.setProperties({
         name: this.newNameInput,
-        title: this.newTitleInput
+        title: this.newTitleInput,
+        primary_group_id: this.newPrimaryGroupInput
       });
 
       return this.model
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index a16b24f80e..1665a825ff 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -266,7 +266,8 @@ const User = RestModel.extend({
       "tracked_tags",
       "watched_tags",
       "watching_first_post_tags",
-      "date_of_birth"
+      "date_of_birth",
+      "primary_group_id"
     ];
 
     const data = this.getProperties(
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
index e654ff0622..6ea1e95b95 100644
--- a/app/assets/javascripts/discourse/routes/preferences-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
@@ -21,7 +21,8 @@ export default RestrictedUserRoute.extend({
     controller.setProperties({
       model: user,
       newNameInput: user.get("name"),
-      newTitleInput: user.get("title")
+      newTitleInput: user.get("title"),
+      newPrimaryGroupInput: user.get("primary_group_id")
     });
   },
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 9f71dccd95..292af19e4d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -149,6 +149,19 @@
   </div>
 {{/if}}
 
+{{#if canSelectPrimaryGroup}}
+  <div class="control-group pref-primary-group">
+    <label class="control-label">{{i18n 'user.primary_group.title'}}</label>
+    <div class="controls">
+      {{combo-box
+        value=newPrimaryGroupInput
+        content=model.filteredGroups
+        none="user.primary_group.none"}}
+    </div>
+  </div>
+{{/if}}
+
+
 {{#if canCheckEmails}}
   <div class="control-group pref-auth-tokens">
     <label class="control-label">{{i18n 'user.auth_tokens.title'}}</label>
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8d8386fa1f..5498a9933b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1429,7 +1429,8 @@ class UsersController < ApplicationController
       :website,
       :dismissed_banner_key,
       :profile_background_upload_url,
-      :card_background_upload_url
+      :card_background_upload_url,
+      :primary_group_id
     ]
 
     editable_custom_fields = User.editable_user_custom_fields(by_staff: current_user.try(:staff?))
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 43c038ba04..52d1214cfd 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -72,6 +72,7 @@ class UserSerializer < BasicUserSerializer
              :profile_view_count,
              :time_read,
              :recent_time_read,
+             :primary_group_id,
              :primary_group_name,
              :primary_group_flair_url,
              :primary_group_flair_bg_color,
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index ac1e489cf8..c5d539e1db 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -82,6 +82,14 @@ class UserUpdater
       user.title = attributes[:title]
     end
 
+    if SiteSetting.user_selected_primary_groups &&
+      attributes[:primary_group_id] &&
+      attributes[:primary_group_id] != user.primary_group_id &&
+      guardian.can_use_primary_group?(user, attributes[:primary_group_id])
+
+      user.primary_group_id = attributes[:primary_group_id]
+    end
+
     CATEGORY_IDS.each do |attribute, level|
       if ids = attributes[attribute]
         CategoryUser.batch_set(user, level, ids)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 471a7f78de..cad4dfdf51 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1300,6 +1300,9 @@ en:
       title:
         title: "Title"
         none: "(none)"
+      primary_group:
+        title: "Primary Group"
+        none: "(none)"
 
       filters:
         all: "All"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2209536a1b..119b727913 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1928,6 +1928,8 @@ en:
 
     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."
 
+    user_selected_primary_groups: "Allow users to set their own primary group"
+
     user_website_domains_whitelist: "User website will be verified against these domains. Pipe-delimited list."
 
     allow_profile_backgrounds: "Allow users to upload profile backgrounds."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ce1fe16575..61ba59496c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -575,6 +575,9 @@ users:
     default: 730
     min: 0
     max: 3650
+  user_selected_primary_groups:
+    default: false
+    client: true
 
 groups:
   enable_group_directory:
diff --git a/lib/guardian.rb b/lib/guardian.rb
index b89f2c6a82..d6c996937d 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -316,6 +316,14 @@ class Guardian
     user.groups.where(title: title).exists?
   end
 
+  def can_use_primary_group?(user, group_id = nil)
+    return false if !user || !group_id
+    group = Group.find_by(id: group_id.to_i)
+
+    user.group_ids.include?(group_id.to_i) &&
+    (group ? !group.automatic : false)
+  end
+
   def can_change_primary_group?(user)
     user && is_staff?
   end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 34a66c9b8c..34a2eae70e 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2378,6 +2378,39 @@ describe Guardian do
     end
   end
 
+  describe 'can_use_primary_group?' do
+    fab!(:group) { Fabricate(:group, title: 'Groupie') }
+
+    it 'is false without a logged in user' do
+      expect(Guardian.new(nil).can_use_primary_group?(user)).to be_falsey
+    end
+
+    it 'is false with no group_id' do
+      user.update(groups: [group])
+      expect(Guardian.new(user).can_use_primary_group?(user, nil)).to be_falsey
+    end
+
+    it 'is false if the group does not exist' do
+      user.update(groups: [group])
+      expect(Guardian.new(user).can_use_primary_group?(user, Group.last.id + 1)).to be_falsey
+    end
+
+    it 'is false if the user is not a part of the group' do
+      user.update(groups: [])
+      expect(Guardian.new(user).can_use_primary_group?(user, group.id)).to be_falsey
+    end
+
+    it 'is false if the group is automatic' do
+      user.update(groups: [Group.new(name: 'autooo', automatic: true)])
+      expect(Guardian.new(user).can_use_primary_group?(user, group.id)).to be_falsey
+    end
+
+    it 'is true if the user is a part of the group, and the group is custom' do
+      user.update(groups: [group])
+      expect(Guardian.new(user).can_use_primary_group?(user, group.id)).to be_truthy
+    end
+  end
+
   describe 'can_change_trust_level?' do
 
     it 'is false without a logged in user' do
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index 1c7f2ed8a2..bdf0f593d6 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe WebHookUserSerializer do
 
   it 'should only include the required keys' do
     count = serializer.as_json.keys.count
-    difference = count - 43
+    difference = count - 44
 
     expect(difference).to eq(0), lambda {
       message = ""
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 8e2515498f..52dc56b5ef 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -249,6 +249,31 @@ describe UserUpdater do
       end
     end
 
+    context 'when updating primary group' do
+      let(:new_group) { Group.create(name: 'new_group') }
+      let(:user) { Fabricate(:user) }
+
+      it 'updates when setting is enabled' do
+        SiteSetting.user_selected_primary_groups = true
+        user.groups << new_group
+        user.update(primary_group_id: nil)
+        UserUpdater.new(acting_user, user).update(primary_group_id: new_group.id)
+
+        user.reload
+        expect(user.primary_group_id).to eq new_group.id
+      end
+
+      it 'does not update when setting is disabled' do
+        SiteSetting.user_selected_primary_groups = false
+        user.groups << new_group
+        user.update(primary_group_id: nil)
+        UserUpdater.new(acting_user, user).update(primary_group_id: new_group.id)
+
+        user.reload
+        expect(user.primary_group_id).to eq nil
+      end
+    end
+
     context 'when update fails' do
       it 'returns false' do
         user = Fabricate(:user)

From 79c2138955f80194f7999b025cf260893234dac0 Mon Sep 17 00:00:00 2001
From: Simon Cossar <scossar3@gmail.com>
Date: Mon, 28 Oct 2019 11:09:42 -0700
Subject: [PATCH 194/328] Fix github oneboxes for RTL locales (#8245)

---
 app/assets/stylesheets/common/base/rtl.scss | 30 +++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 23e56d0e8f..01735b79cd 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -60,3 +60,33 @@
   padding-right: 40px;
   padding-left: 40px;
 }
+
+// Fixes github oneboxes for RTL sites
+.rtl aside.onebox.githubblob {
+  padding: 12px 25px 12px 12px !important;
+  direction: ltr !important;
+}
+
+.rtl aside.onebox.githubblob .source {
+  background-position: 0 50% !important;
+  padding-right: 20px;
+}
+
+.rtl pre.onebox code ol.lines {
+  margin: 0 0 0 40px !important;
+}
+
+.rtl pre.onebox code ol.lines li:before {
+  right: -40px;
+  padding-left: 5px;
+  padding-right: 0;
+  text-align: right !important;
+}
+
+.rtl pre.onebox code ol.lines li {
+  padding-right: 5px;
+  padding-left: 0;
+  margin-right: 0;
+  border-right: 1px solid #cfcfcf;
+  border-left: none !important;
+}

From 918bb76f7635362ca9cae76834f79f0a570707f2 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 28 Oct 2019 17:56:47 +0000
Subject: [PATCH 195/328] DEV: No need to look up a category repeatedly by its
 slug

---
 app/controllers/list_controller.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index e7c0de86dc..66833a623f 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -140,11 +140,7 @@ class ListController < ApplicationController
     view_method = @category.default_view
     view_method = 'latest' unless %w(latest top).include?(view_method)
 
-    if view_method == 'top'
-      top(category: @category.id)
-    else
-      self.public_send(view_method)
-    end
+    self.public_send(view_method, category: @category.id)
   end
 
   def topics_by

From 071a82efe30e8f5fda274dfb1de4e0382ba132bf Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 28 Oct 2019 18:32:13 +0000
Subject: [PATCH 196/328] FIX: Correct error when sending PM to email address

---
 .../javascripts/discourse/lib/user-search.js.es6       |  6 +++---
 test/javascripts/lib/user-search-test.js.es6           | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index 90b3a3d28e..5288fae589 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -54,9 +54,9 @@ function performSearch(
   oldSearch
     .then(function(r) {
       const hasResults = !!(
-        r.users.length ||
-        r.groups.length ||
-        r.emails.length
+        (r.users && r.users.length) ||
+        (r.groups && r.groups.length) ||
+        (r.emails && r.emails.length)
       );
 
       if (eagerComplete && !hasResults) {
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index 5d11b47903..28a298c0fb 100644
--- a/test/javascripts/lib/user-search-test.js.es6
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -27,6 +27,10 @@ QUnit.module("lib:user-search", {
           ]});
       }
 
+      if(request.url.match(/no-results/)){
+        return response({users: []});
+      }
+
       return response({
         users: [
           {
@@ -167,4 +171,10 @@ QUnit.test("it skips a search depending on punctuations", async assert => {
 
   results = await userSearch({ term: "sam@sam.com" });
   assert.equal(results.length, 0);
+
+  results = await userSearch({
+    term: "no-results@example.com",
+    allowEmails: true
+  });
+  assert.equal(results.length, 1);
 });

From 3b72a36c5d0fcbbbd9af4355bd0d8ac138514feb Mon Sep 17 00:00:00 2001
From: Oliver Walker <oliverw56@gmail.com>
Date: Mon, 28 Oct 2019 15:44:13 -0400
Subject: [PATCH 197/328] create plugin outlet and pass model to
 above-review-filters (#8257)

---
 app/assets/javascripts/discourse/templates/review-index.hbs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/templates/review-index.hbs
index 88f092a092..86799229f1 100644
--- a/app/assets/javascripts/discourse/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/templates/review-index.hbs
@@ -23,6 +23,9 @@
     </div>
 
     {{#if filtersExpanded}}
+
+      {{plugin-outlet name="above-review-filters" args=(hash model=model)}}
+
       <div class='reviewable-filter'>
         <label class='filter-label'>{{i18n "review.filters.type.title"}}</label>
         {{combo-box value=filterType content=allTypes none="review.filters.type.all"}}

From bacc1144627f73f15650fab1df9c14277b2ea5b8 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 28 Oct 2019 16:04:29 -0400
Subject: [PATCH 198/328] UX: Convert alert & modal close to buttons for
 improved accessibility

---
 .../templates/components/d-modal.hbs          |  6 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../notification-consent-banner.hbs           |  4 +-
 .../components/pwa-install-banner.hbs         |  4 +-
 .../templates/components/share-popup.hbs      |  5 +-
 app/assets/stylesheets/common/base/alert.scss | 15 +----
 .../common/components/buttons.scss            | 67 ++++++++++---------
 .../stylesheets/common/foundation/mixins.scss |  4 +-
 8 files changed, 46 insertions(+), 63 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 4e7cd0dca2..6c6106bbad 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -3,11 +3,7 @@
     <div class="modal-inner-container">
       <div class="modal-header">
         {{#if dismissable}}
-          <div class='modal-close'>
-            <a class="close" href {{action closeModal}}>
-              {{d-icon "times"}}
-            </a>
-          </div>
+          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" }}
         {{/if}}
 
         {{#if panels}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index d7e0c5e1d4..ad5cccf6a9 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,9 +1,7 @@
 {{#if visible}}
   <div class="row">
     <div id="banner" class={{overlay}}>
-      <div class="close" {{action "dismiss"}}>
-        {{d-icon "times" title="banner.close"}}
-      </div>
+      {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
         {{{banner.html}}}
         {{#if currentUser.staff}}
diff --git a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
index e93d62a3ba..e249c7f98f 100644
--- a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
@@ -1,9 +1,7 @@
 {{#if showNotificationPromptBanner}}
   <div class="row">
     <div class="consent_banner alert alert-info">
-      <div class="close" {{action "dismiss"}}>
-        {{d-icon 'times'}}
-      </div>
+      {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       {{i18n 'user.desktop_notifications.consent_prompt'}} <a {{action "turnon"}}>{{i18n 'user.desktop_notifications.enable'}}</a>.
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs
index d0391747ea..d394724ab4 100644
--- a/app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs
@@ -1,9 +1,7 @@
 {{#if showPWAInstallBanner}}
   <div class="row">
     <div class="pwa-install-banner alert alert-info">
-      <div class="close" {{action "dismiss"}}>
-        {{d-icon 'times'}}
-      </div>
+      {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <span>
         {{discourse-linked-text action=(action "turnOn") translatedText=(i18n "pwa.install_banner" title=siteSettings.title)}}
       </span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 55f287720b..6f0428b1aa 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -35,8 +35,7 @@
       </div>
     {{/if}}
 
-    <a href {{action "close"}} class="close-share" aria-label={{i18n "share.close"}} title={{i18n "share.close"}}>
-      {{d-icon "times"}}
-    </a>
+
+    {{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/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 8d05c6a158..f605d993cf 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -8,21 +8,12 @@
     position: absolute;
     top: 8px;
     right: 8px;
-    line-height: $line-height-small;
     font-size: $font-up-3;
-    color: $primary-low-mid;
-    @include hover {
-      color: $primary-medium;
-      cursor: pointer;
+    .d-icon {
+      color: $primary-low-mid;
     }
   }
-  button.close {
-    padding: 0;
-    cursor: pointer;
-    background: transparent;
-    border: 0;
-    -webkit-appearance: none;
-  }
+
   &.alert-success {
     background-color: $success-low;
     color: $primary;
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index de22978dad..018fc94bdd 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -59,15 +59,11 @@
     color: $primary;
     min-height: unset; // ovverides button defaults
   }
-  .discourse-no-touch & {
-    // only allow hover on no-touch devices
-    &:hover,
-    &.btn-hover {
-      background: $primary-medium;
-      color: $secondary;
-      .d-icon {
-        color: $secondary-very-high;
-      }
+  @include hover {
+    background: $primary-medium;
+    color: $secondary;
+    .d-icon {
+      color: $secondary-very-high;
     }
   }
   &[disabled],
@@ -104,17 +100,13 @@
   &[href] {
     color: $secondary;
   }
-  .discourse-no-touch & {
-    // only allow hover on no-touch devices
-    &:hover,
-    &.btn-hover {
-      background: dark-light-choose(
-        scale-color($tertiary, $lightness: -20%),
-        scale-color($tertiary, $lightness: 20%)
-      );
-      .d-icon {
-        color: currentColor;
-      }
+  @include hover {
+    background: dark-light-choose(
+      scale-color($tertiary, $lightness: -20%),
+      scale-color($tertiary, $lightness: 20%)
+    );
+    .d-icon {
+      color: currentColor;
     }
   }
   &:active,
@@ -146,17 +138,13 @@
   &[href] {
     color: $secondary;
   }
-  .discourse-no-touch & {
-    // only allow hover on no-touch devices
-    &:hover,
-    &.btn-hover {
-      background: dark-light-choose(
-        scale-color($danger, $lightness: -20%),
-        scale-color($danger, $lightness: 20%)
-      );
-      .d-icon {
-        color: $danger-low;
-      }
+  @include hover {
+    background: dark-light-choose(
+      scale-color($danger, $lightness: -20%),
+      scale-color($danger, $lightness: 20%)
+    );
+    .d-icon {
+      color: $danger-low;
     }
   }
   &:active,
@@ -266,8 +254,21 @@
   .d-icon {
     color: $primary-low-mid;
   }
-  .discourse-no-touch & {
-    &:hover {
+  @include hover {
+    .d-icon {
+      color: $primary;
+    }
+  }
+  &.close {
+    padding: 0;
+    min-height: unset;
+    background: transparent;
+    font-size: $font-up-3;
+    .d-icon {
+      color: $primary-high;
+    }
+    @include hover {
+      background: transparent;
       .d-icon {
         color: $primary;
       }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 8a83dd6c78..99f7634547 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -47,9 +47,11 @@ $breakpoints: (
 // Visibility
 // --------------------------------------------------
 
+// Only shows hover on non-touch devices
 @mixin hover {
   .discourse-no-touch & {
-    &:hover {
+    &:hover,
+    &.btn-hover {
       @content;
     }
   }

From 197ad8cd6ed574083fc3f0f7be35ba3d5732714f Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Mon, 28 Oct 2019 17:17:28 -0300
Subject: [PATCH 199/328] DEV: Run a faster test when warming up

---
 lib/tasks/docker.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index e3e9a19971..db325dc00a 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -146,7 +146,7 @@ task 'docker:test' do
         puts "travis_fold:start:ruby_tests" if ENV["TRAVIS"]
 
         if ENV['WARMUP_TMP_FOLDER']
-          run_or_fail('bundle exec rspec ./spec/requests/users_controller_spec.rb:222')
+          run_or_fail('bundle exec rspec ./spec/requests/clicks_controller_spec.rb')
         end
 
         unless ENV["SKIP_CORE"]

From 4935c9f1f8db54312d8343a278c23cb0d3f6b61b Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 28 Oct 2019 16:36:37 -0400
Subject: [PATCH 200/328] DEV: replace inline RTL attributes with classes in
 digest.html.erb

---
 app/views/user_notifications/digest.html.erb | 100 +++++++++----------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 3d3914999e..fc187f6d48 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -13,7 +13,7 @@
     </tr>
   </table>
 <%- else %>
-<table class="digest-header text-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#<%= @header_bgcolor -%>;width:100%;">
+<table class="digest-header text-header with-dir" style="background-color:#<%= @header_bgcolor -%>;width:100%;">
   <tr>
     <td align="center" style="text-align: center;padding: 20px 0; font-family:Helvetica,Arial,sans-serif;">
 
@@ -30,11 +30,11 @@
 </table>
 <%- end %>
 
-<table class="digest-content" dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
+<table class="body digest-content with-dir" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <div class="with-accent-colors">
-        <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="border-spacing:0;padding:0;width:100%">
+        <table class="spacer" style="border-spacing:0;padding:0;width:100%">
           <tbody>
             <tr>
               <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
@@ -44,17 +44,17 @@
       </div>
     </td>
     <td style="vertical-align:top;padding:0;font-family:Helvetica,Arial,sans-serif;">
-      <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" class="digest-content-header with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
+      <table align="center" class="digest-content-header with-accent-colors with-dir" style="border-spacing:0;margin:0;padding:0;vertical-align:top;width:100%">
         <tbody>
           <tr>
-            <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
+            <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
 
 <br/>
 <center class="header-since-last-visit with-accent-colors" style="font-size:22px;font-weight:400;"><%=t 'user_notifications.digest.since_last_visit' %></center>
 
 
 
-<table class="header-stats" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%">
+<table class="header-stats with-dir" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%">
 <tbody>
   <tr class="header-stat-count">
     <%- @counts.each do |count| -%>
@@ -80,22 +80,22 @@
           </tr>
         </tbody>
       </table>
-      <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
+      <table class="with-dir" align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
         <tbody>
           <tr>
-            <td class="digest-popular-topic-wrapper" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
+            <td class="digest-popular-topic-wrapper with-dir" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
 
 <% @popular_topics.each_with_index do |t, i| %>
 <!--   Beginning of Popular Topic   -->
-<table class="digest-topic popular-topic" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%">
+<table class="digest-topic popular-topic with-dir" style="width:100%">
   <tbody>
     <tr>
-      <td class="digest-topic-category" style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+      <td class="digest-topic-category with-dir" style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;vertical-align:top;">
         <p style="color:#8f8f8f;line-height:1.3;margin: 20px 0 0 0;">
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </p>
       </td>
-      <td style="margin:0;padding:<%= rtl? ? '0 0 0 16px' : '0 16px 0 0' %>;text-align:<%= rtl? ? 'left' : 'right' %>;vertical-align:top;">
+      <td class="with-dir" style="margin:0;padding:<%= rtl? ? '0 0 0 16px' : '0 16px 0 0' %>;text-align:<%= rtl? ? 'left' : 'right' %>;vertical-align:top;">
         <p class="text-right digest-created-at" style="color:#8f8f8f;line-height:1.3;margin:20px 0 0 0;font-weight:400;">
           <%= short_date(t.created_at) %>
         </p>
@@ -104,10 +104,10 @@
   </tbody>
 </table>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="vertical-align:top;width:100%">
+<table class="with-dir" style="vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="padding:<%= rtl? ? '0 16px 8px 8px' : '0 8px 8px 16px' %>; text-align:<%= rtl? ? 'right' : 'left' %>; width:100%;">
+      <td class="with-dir" style="padding:<%= rtl? ? '0 16px 8px 8px' : '0 8px 8px 16px' %>;width:100%;">
         <h2 class="digest-topic-title" style="font-size:18px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal">
           <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
             <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
@@ -121,13 +121,13 @@
   </tbody>
 </table>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="with-dir" style="padding:0;position:relative;vertical-align:top;width:100%">
   <tbody>
     <tr>
       <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;">
         <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center">
       </td>
-      <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+      <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;">
         <% if t.user %>
           <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %>
             <h6 class="digest-topic-username" style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
@@ -136,8 +136,8 @@
         <% end %>
       </td>
       <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
-        <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;" align="right">
-          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-align:<%= rtl? ? 'left' : 'right' %>;text-decoration:none;">
+        <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;" align="right">
+          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-decoration:none;">
         </td>
       <%- end -%>
     </tr>
@@ -145,10 +145,10 @@
 </table>
 
 <%- if t.first_post.present? && !t.first_post.user_deleted %>
-<table class="digest-topic-body" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-bottom:1px solid #f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="digest-topic-body with-dir" style="border-bottom:1px solid #f3f3f3;padding:0;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%;font-weight:normal;">
+      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;width:100%;font-weight:normal;">
         <%= @excerpts[t.first_post.id] %>
       </td>
     </tr>
@@ -156,18 +156,18 @@
 </table>
 <%- end %>
 
-<table class="digest-topic-stats" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%; margin-top:20px;">
+<table class="digest-topic-stats with-dir" style="padding:0;vertical-align:top;width:100%; margin-top:20px;">
   <tbody>
     <tr>
-      <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
+      <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;white-space:nowrap;vertical-align:top;width:75px">
         <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.like_count -%></p>
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
       </td>
-      <td class="digest-topic-stat" style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
+      <td class="digest-topic-stat" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;width:75px">
         <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.posts_count - 1 -%></p>
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
-      <td class="digest-topic-posters" style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;">
+      <td class="digest-topic-posters" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;">
         <% t.posters_summary.each do |ps| %>
           <% if ps.user %>
             <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;">
@@ -183,7 +183,7 @@
   </tbody>
 </table>
 <div style="background-color:#f3f3f3;">
-  <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="padding:0;width:100%">
+  <table class="spacer with-dir" style="padding:0;width:100%">
     <tbody><tr><td height="20px" style="border-collapse:collapse!important;line-height:20px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr></tbody>
   </table>
 </div>
@@ -203,7 +203,7 @@
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <!-- Background that goes down part-way behind content -->
       <div class="with-accent-colors">
-        <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="border-spacing:0;padding:0;width:100%">
+        <table class="spacer with-dir" style="border-spacing:0;padding:0;width:100%">
           <tbody>
             <tr>
               <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
@@ -221,38 +221,38 @@
   <%=t 'user_notifications.digest.popular_posts' %>
 </center>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+<table class="body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-    <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+    <td class="with-dir" align="center" valign="top" style="width:90%;border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;vertical-align:top;">
 
 <% @popular_posts.each do |post| %>
 
 <!--   Beginning of Popular Post   -->
-<table class="popular-post-excerpt" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+<table class="popular-post-excerpt with-dir" style="width:100%;background:#fefefe;border-spacing:0;padding:0;vertical-align:top;">
   <tbody>
     <tr>
-      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;font-weight:normal;padding:16px;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%;">
+      <td class="post-excerpt with-dir" style="color:#0a0a0a;font-size:14px;font-weight:normal;padding:16px;width:100%;">
         <%= email_excerpt(post.cooked, post) %>
       </td>
     </tr>
   </tbody>
 </table>
 
-<table class="popular-post-spacer" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-spacing:0;background-color:#f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="popular-post-spacer with-dir" style="border-spacing:0;background-color:#f3f3f3;padding:0;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;">
+      <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;">
         <img src="<%= email_image_url 'right_triangle.png' -%>" style="clear:both;display:block;height:20px;width:20px;outline:0;text-decoration:none;">
       </td>
     </tr>
   </tbody>
 </table>
 
-<table class="popular-post-meta" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#f3f3f3;padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="popular-post-meta with-dir" style="background-color:#f3f3f3;padding:0;position:relative;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="padding:0 8px 8px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;width:50px;vertical-align:top;">
+      <td style="padding:0 8px 8px 8px;width:50px;vertical-align:top;">
         <img src="<%= post.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;height:50px;width:50px;outline:0;">
       </td>
       <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;">
@@ -264,8 +264,8 @@
         <% end %>
       </td>
       <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:<%= rtl? ? 'left' : 'right' %>;">
-        <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'left' : 'right' %>;">
-          <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%></a>
+        <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;">
+          <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%></a>
         </p>
         <a href="<%= post.full_url -%>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space: nowrap;">
           <%=t 'user_notifications.digest.join_the_discussion' %>
@@ -276,8 +276,8 @@
 </table>
 
 <div style="background-color:#f3f3f3">
-  <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
-    <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
+  <table class="spacer with-dir" style="padding:0;vertical-align:top;width:100%">
+    <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
   </table>
 </div>
 <!--   End of Popular Post   -->
@@ -297,43 +297,43 @@
 <% if @other_new_for_you.present? %>
   <center class="digest-new-header" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Helvetica,Arial,sans-serif;"><%=t 'user_notifications.digest.more_new' %></center>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="digest-new-topics body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
+<table class="digest-new-topics body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
     <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;margin:0;padding:0;">
 
-<table class="digest-new-topic" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+<table class="digest-new-topic with-dir" style="padding:0;vertical-align:top;width:100%">
   <tbody>
 
 <% @other_new_for_you.each do |t| %>
 
 <!--   Begin new topic  -->
     <tr style="vertical-align:top;">
-      <td class="digest-new-topic-title" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
-        <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
+      <td class="digest-new-topic-title with-dir" style="padding:8px;">
+        <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none;">
           <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
         </a>
         <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
           <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
         <%- end %>
-        <p class="digest-new-topic-category" style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>">
+        <p class="digest-new-topic-category" style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;">
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </p>
       </td>
-      <td class="digest-new-topic-posters" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+      <td class="digest-new-topic-posters with-dir" style="padding:8px;">
         <% t.posters_summary[0,2].each do |ps| %>
           <% if ps.user %>
             <img src="<%= ps.user.small_avatar_url -%>" style="height:20px;width:20px;margin:<%= rtl? ? '0 0 5px 5px' : '0 5px 5px 0' %>;border-radius:50%;clear:both;display:inline-block;outline:0;text-decoration:none;">
           <% end %>
         <% end %>
       </td>
-      <td class="digest-new-topic-stat" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+      <td class="digest-new-topic-stat with-dir" style="padding:8px;">
         <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.like_count -%></p>
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
       </td>
-      <td class="digest-new-topic-stat digest-replies" style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+      <td class="digest-new-topic-stat digest-replies with-dir" style="padding:8px;">
         <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.posts_count - 1 -%></p>
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
     </tr>
 
@@ -401,7 +401,7 @@
 
 <%= digest_custom_html("above_footer") %>
 
-<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='summary-footer' style="width: 100%">
+<table class='summary-footer with-dir' style="width: 100%">
   <tr>
     <td align="center">
   <%=raw(t 'user_notifications.digest.unsubscribe',

From 64d51ab45ed1d456a0e92b21c0b816108670d88b Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Mon, 28 Oct 2019 14:08:32 -0700
Subject: [PATCH 201/328] DEV: add UNICORN_BIND_ALL

listen on local interface by default.
---
 config/unicorn.conf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index e38f345efa..f4e6c4f9a3 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -15,7 +15,7 @@ worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
 working_directory discourse_path
 
 # listen "#{discourse_path}/tmp/sockets/unicorn.sock"
-listen (ENV["UNICORN_PORT"] || 3000).to_i
+listen "#{(ENV["UNICORN_BIND_ALL"] ? "" : "127.0.0.1:")}#{(ENV["UNICORN_PORT"] || 3000).to_i}"
 
 if !File.exist?("#{discourse_path}/tmp/pids")
   FileUtils.mkdir_p("#{discourse_path}/tmp/pids")

From f686ab988fd4f526bdc4c55580ac67235c7bd540 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 28 Oct 2019 17:23:21 -0400
Subject: [PATCH 202/328] FIX: close modals on ESC key and clicking outside

---
 app/assets/javascripts/discourse/components/d-modal.js.es6 | 4 ++--
 test/javascripts/acceptance/category-edit-test.js.es6      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index b8dbcc4967..0c83f529ad 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -32,7 +32,7 @@ export default Component.extend({
   setUp() {
     $("html").on("keydown.discourse-modal", e => {
       if (e.which === 27 && this.dismissable) {
-        Ember.run.next(() => $(".modal-header a.close").click());
+        Ember.run.next(() => $(".modal-header button.modal-close").click());
       }
 
       if (e.which === 13 && this.triggerClickOnEnter(e)) {
@@ -73,7 +73,7 @@ export default Component.extend({
       // Delegate click to modal close if clicked outside.
       // We do this because some CSS of ours seems to cover
       // the backdrop and makes it unclickable.
-      $(".modal-header a.close").click();
+      $(".modal-header button.modal-close").click();
     }
   },
 
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js.es6
index 690e028ead..fed9c84531 100644
--- a/test/javascripts/acceptance/category-edit-test.js.es6
+++ b/test/javascripts/acceptance/category-edit-test.js.es6
@@ -13,7 +13,7 @@ QUnit.test("Can open the category modal", async assert => {
   await click(".edit-category");
   assert.ok(visible(".d-modal"), "it pops up a modal");
 
-  await click("a.close");
+  await click("button.modal-close");
   assert.ok(!visible(".d-modal"), "it closes the modal");
 });
 

From 6d381b33a45b751186022aa1d15c3d2758feb6ef Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Mon, 28 Oct 2019 17:19:42 -0700
Subject: [PATCH 203/328] copyedits on moderator welcome PM

---
 config/locales/server.en.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 119b727913..d39d87b50a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2663,11 +2663,13 @@ en:
 
     welcome_moderator:
       title: "Welcome Moderator"
-      subject_template: "Congratulations on becoming a moderator!"
+      subject_template: "Congratulations, you’re now a moderator!"
       text_body_template: |
-        You are now a moderator. -- congratulations!
+        You’ve been granted moderator status by a fellow staff member.
 
-        You now have access to the <a href='%{base_url}/admin' target='_blank'>admin interface</a>
+        As a moderator, you now have access to the <a href='%{base_url}/admin' target='_blank'>admin interface</a>.
+
+        With great power comes great responsibility. If you’re new to moderating, please refer to the [Moderation Guide](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Welcome Invite"
       subject_template: "Welcome to %{site_name}!"

From 001c593155e8e6a53715cd9485c7c594e4999a23 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 29 Oct 2019 15:49:55 +1100
Subject: [PATCH 204/328] FIX: place image scale buttons unconditionally

Defer placing scale buttons causes "scale image" buttons to be missing if
you manage to scroll mouse to the area where the image is prior to image
rendering.

This fix ensures scale buttons are always rendered leaving all the hiding
and styling entirely to CSS.

This also corrects a bug where scaling toolbar was missing on mobile
---
 .../discourse/components/composer-editor.js.es6    | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 0709dc9c5f..cc419e1af9 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -202,14 +202,6 @@ export default Component.extend({
       );
     }
 
-    if (!this.site.mobileView) {
-      $preview
-        .off("touchstart mouseenter", "img")
-        .on("touchstart mouseenter", "img", () => {
-          this._placeImageScaleButtons($preview);
-        });
-    }
-
     // Focus on the body unless we have a title
     if (
       !this.get("composer.canEditTitle") &&
@@ -928,8 +920,6 @@ export default Component.extend({
   },
 
   showPreview() {
-    const $preview = $(this.element.querySelector(".d-editor-preview-wrapper"));
-    this._placeImageScaleButtons($preview);
     this.send("togglePreview");
   },
 
@@ -1078,9 +1068,7 @@ export default Component.extend({
         );
       }
 
-      if (this.site.mobileView && $preview.is(":visible")) {
-        this._placeImageScaleButtons($preview);
-      }
+      this._placeImageScaleButtons($preview);
 
       this.trigger("previewRefreshed", $preview);
       this.afterRefresh($preview);

From b92e4465f728451addc9bbf5ed8aab8e02deeef6 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 29 Oct 2019 16:01:15 +1100
Subject: [PATCH 205/328] DEV: stop depending on hover for image resize icons

We no longer defer render the resize links, so we no longer need all these
hover events to test it.

Corrects broken test.
---
 .../acceptance/composer-test.js.es6           | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 004a4e2938..262146ab3d 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -734,13 +734,6 @@ QUnit.test("Image resizing buttons", async assert => {
 
   await fillIn(".d-editor-input", uploads.join("\n"));
 
-  assert.ok(
-    find(".button-wrapper").length === 0,
-    "it does not append scaling buttons before hovering images"
-  );
-
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   assert.ok(
     find(".button-wrapper").length === 6,
     "it adds correct amount of scaling button groups"
@@ -750,34 +743,24 @@ QUnit.test("Image resizing buttons", async assert => {
   await click(find(".button-wrapper .scale-btn[data-scale='50']")[0]);
   assertImageResized(assert, uploads);
 
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   uploads[2] = "![anotherOne|690x463,75%](upload://anotherOne.jpeg)";
   await click(find(".button-wrapper .scale-btn[data-scale='75']")[1]);
   assertImageResized(assert, uploads);
 
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   uploads[7] =
     "![onTheSameLine1|200x200,50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)";
   await click(find(".button-wrapper .scale-btn[data-scale='50']")[2]);
   assertImageResized(assert, uploads);
 
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   uploads[7] =
     "![onTheSameLine1|200x200,50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250,75%](upload://onTheSameLine2.jpeg)";
   await click(find(".button-wrapper .scale-btn[data-scale='75']")[3]);
   assertImageResized(assert, uploads);
 
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   uploads[8] = "![identicalImage|300x300,50%](upload://identicalImage.png)";
   await click(find(".button-wrapper .scale-btn[data-scale='50']")[4]);
   assertImageResized(assert, uploads);
 
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   uploads[9] = "![identicalImage|300x300,75%](upload://identicalImage.png)";
   await click(find(".button-wrapper .scale-btn[data-scale='75']")[5]);
   assertImageResized(assert, uploads);
@@ -791,8 +774,6 @@ QUnit.test("Image resizing buttons", async assert => {
     `
   );
 
-  await triggerEvent($(".d-editor-preview img"), "mouseover");
-
   assert.ok(
     find("script").length === 0,
     "it does not unescapes script tags in code blocks"

From 492742837e65ec104dce1698be9ef2676bebc85d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 29 Oct 2019 17:07:33 +1100
Subject: [PATCH 206/328] PERF: stop destroying drafts on client when posting
 replies

The server already ensures it advances draft keys when a post is created
this means this code that used to delete drafts is simply introducing
composer delays with no benefit.
---
 .../discourse/controllers/composer.js.es6     | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index ad34970e5b..dbc9a59f9a 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -687,47 +687,33 @@ export default Controller.extend({
           });
         }
 
-        // If user "created a new topic/post" or "replied as a new topic" successfully, remove the draft.
-        let destroyDraftPromise;
-
-        if (result.responseJson.action === "create_post") {
-          destroyDraftPromise = this.destroyDraft();
+        if (this.get("model.editingPost")) {
+          this.appEvents.trigger("post-stream:refresh", {
+            id: parseInt(result.responseJson.id)
+          });
+          if (result.responseJson.post.post_number === 1) {
+            this.appEvents.trigger("header:update-topic", composer.topic);
+          }
         } else {
-          destroyDraftPromise = Ember.RSVP.Promise.resolve();
+          this.appEvents.trigger("post-stream:refresh");
         }
 
-        return destroyDraftPromise.then(() => {
-          if (this.get("model.editingPost")) {
-            this.appEvents.trigger("post-stream:refresh", {
-              id: parseInt(result.responseJson.id)
-            });
-            if (result.responseJson.post.post_number === 1) {
-              this.appEvents.trigger("header:update-topic", composer.topic);
-            }
-          } else {
-            this.appEvents.trigger("post-stream:refresh");
-          }
+        if (result.responseJson.action === "create_post") {
+          this.appEvents.trigger("post:highlight", result.payload.post_number);
+        }
+        this.close();
 
-          if (result.responseJson.action === "create_post") {
-            this.appEvents.trigger(
-              "post:highlight",
-              result.payload.post_number
-            );
-          }
-          this.close();
+        const currentUser = this.currentUser;
+        if (composer.creatingTopic) {
+          currentUser.set("topic_count", currentUser.topic_count + 1);
+        } else {
+          currentUser.set("reply_count", currentUser.reply_count + 1);
+        }
 
-          const currentUser = this.currentUser;
-          if (composer.creatingTopic) {
-            currentUser.set("topic_count", currentUser.topic_count + 1);
-          } else {
-            currentUser.set("reply_count", currentUser.reply_count + 1);
-          }
-
-          const post = result.target;
-          if (post && !staged) {
-            DiscourseURL.routeTo(post.url);
-          }
-        });
+        const post = result.target;
+        if (post && !staged) {
+          DiscourseURL.routeTo(post.url);
+        }
       })
       .catch(error => {
         composer.set("disableDrafts", false);

From 417be323a214a39e9cf65fcb200c80ac52e0e7c4 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 29 Oct 2019 18:25:00 +1100
Subject: [PATCH 207/328] FIX: flaky jobs_base_spec.rb (#8258)

I was searching for a reason for randomly failing jobs_base_spec.rb. The reason was that after restorer_spec, the database is not restored to default.
After restorer spec RailsMultisite::ConnectionManagement.all_dbs is returning array of ['default', 'second']

Then base job execution is evaluated twice
```
dbs = RailsMultisite::ConnectionManagement.all_dbs
dbs.each do |db|
     execute(opts)
end
```
---
 spec/lib/backup_restore/restorer_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index fa928c5f3d..e49466092f 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -110,6 +110,7 @@ describe BackupRestore::Restorer do
       described_class.any_instance.stubs(initialize_state: true)
     end
     after do
+      RailsMultisite::ConnectionManagement.clear_settings!
       conn.establish_connection(db: 'default')
     end
     let(:conn) { RailsMultisite::ConnectionManagement }

From 2989276c06e665c01dc281f9b4cba28102799c8d Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 29 Oct 2019 08:46:42 +0000
Subject: [PATCH 208/328] DEV: url_for on a String returns the string unchanged

...which makes it quite unnecessary.
---
 app/controllers/list_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 66833a623f..fad041f4b9 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -147,8 +147,8 @@ class ListController < ApplicationController
     list_opts = build_topic_list_options
     target_user = fetch_user_from_params({ include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts) }, [:user_stat, :user_option])
     list = generate_list_for("topics_by", target_user, list_opts)
-    list.more_topics_url = url_for(construct_url_with(:next, list_opts))
-    list.prev_topics_url = url_for(construct_url_with(:prev, list_opts))
+    list.more_topics_url = construct_url_with(:next, list_opts)
+    list.prev_topics_url = construct_url_with(:prev, list_opts)
     respond_with_list(list)
   end
 
@@ -160,8 +160,8 @@ class ListController < ApplicationController
 
     list_opts = build_topic_list_options
     list = generate_list_for("group_topics", group, list_opts)
-    list.more_topics_url = url_for(construct_url_with(:next, list_opts))
-    list.prev_topics_url = url_for(construct_url_with(:prev, list_opts))
+    list.more_topics_url = construct_url_with(:next, list_opts)
+    list.prev_topics_url = construct_url_with(:prev, list_opts)
     respond_with_list(list)
   end
 
@@ -172,8 +172,8 @@ class ListController < ApplicationController
       guardian.ensure_can_see_private_messages!(target_user.id)
       list = generate_list_for(action.to_s, target_user, list_opts)
       url_prefix = "topics"
-      list.more_topics_url = url_for(construct_url_with(:next, list_opts, url_prefix))
-      list.prev_topics_url = url_for(construct_url_with(:prev, list_opts, url_prefix))
+      list.more_topics_url = construct_url_with(:next, list_opts, url_prefix)
+      list.prev_topics_url = construct_url_with(:prev, list_opts, url_prefix)
       respond_with_list(list)
     end
   end

From 0c475297136cbe15437e93c86a4656f43ba5f783 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 29 Oct 2019 10:00:00 +0000
Subject: [PATCH 209/328] DEV: Mark flaky tests as pending

---
 spec/lib/backup_restore/restorer_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index e49466092f..b1e6e83ee9 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -2,7 +2,8 @@
 
 require 'rails_helper'
 
-describe BackupRestore::Restorer do
+# This causes flakiness
+xdescribe BackupRestore::Restorer do
   it 'detects which pg_dump output is restorable to different schemas' do
     {
       "9.6.7" => true,

From ff9345fbb0bff0eb72c4a68de6a70a01b0525b80 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 29 Oct 2019 12:10:27 +0200
Subject: [PATCH 210/328] DEV: simplify logic (#8249)

Anonymous users are only possible if allow_anonymous_posting is true,
which means that 'user.is_anonymous' check implies that
allow_anonymous_posting is true.
---
 .../discourse/routes/preferences-second-factor.js.es6           | 2 +-
 app/controllers/application_controller.rb                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
index 763460bc23..cae63a6707 100644
--- a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
@@ -45,7 +45,7 @@ export default RestrictedUserRoute.extend({
       if (
         transition.targetName === "preferences.second-factor" ||
         !user ||
-        (settings.allow_anonymous_posting && user.is_anonymous) ||
+        user.is_anonymous ||
         user.second_factor_enabled ||
         (settings.enforce_second_factor === "staff" && !user.staff) ||
         settings.enforce_second_factor === "no"
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 26a1bdf175..1cd6bd39e5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -734,7 +734,7 @@ class ApplicationController < ActionController::Base
     check_totp = current_user &&
       !request.format.json? &&
       !is_api? &&
-      !(SiteSetting.allow_anonymous_posting && current_user.anonymous?) &&
+      !current_user.anonymous? &&
       ((SiteSetting.enforce_second_factor == 'staff' && current_user.staff?) ||
         SiteSetting.enforce_second_factor == 'all') &&
       !current_user.totp_enabled?

From 15316442889b3d52182357b9b63168848a488dc1 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 29 Oct 2019 12:12:09 +0200
Subject: [PATCH 211/328] DEV: Add test (#8250)

Follow-up to 2863e7c181843261a0d7b6c9255185a38b7f2680.
---
 .../components/badge-title-test.js.es6        | 36 +++++++++++++++++++
 .../javascripts/helpers/component-test.js.es6 |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 test/javascripts/components/badge-title-test.js.es6

diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js.es6
new file mode 100644
index 0000000000..a6af1eff06
--- /dev/null
+++ b/test/javascripts/components/badge-title-test.js.es6
@@ -0,0 +1,36 @@
+import selectKit from "helpers/select-kit-helper";
+import componentTest from "helpers/component-test";
+
+moduleForComponent("badge-title", { integration: true });
+
+componentTest("badge title", {
+  template:
+    "{{badge-title selectableUserBadges=selectableUserBadges user=user}}",
+
+  beforeEach() {
+    this.set("subject", selectKit());
+    this.set("selectableUserBadges", [
+      Ember.Object.create({
+        badge: { name: "(none)" }
+      }),
+      Ember.Object.create({
+        id: 42,
+        badge_id: 102,
+        badge: { name: "Test" }
+      })
+    ]);
+  },
+
+  async test(assert) {
+    /* global server */
+    server.put("/u/eviltrout/preferences/badge_title", () => [
+      200,
+      { "Content-Type": "application/json" },
+      {}
+    ]);
+    await this.subject.expand();
+    await this.subject.selectRowByValue(42);
+    await click(".btn");
+    assert.equal(this.currentUser.title, "Test");
+  }
+});
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 8ddd75012a..e694cb8a05 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -33,6 +33,7 @@ export default function(name, opts) {
       this.registry.register("current-user:main", this.currentUser, {
         instantiate: false
       });
+      this.registry.injection("component", "currentUser", "current-user:main");
       this.registry.register(
         "topic-tracking-state:main",
         TopicTrackingState.create({ currentUser }),

From c5bcad10a6d5fe91b45e37ae7670e93745e9a870 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 29 Oct 2019 21:32:43 +1100
Subject: [PATCH 212/328] FIX: more flaky jobs_base_spec.rb (#8259)

This commit is follow up of https://github.com/discourse/discourse/commit/417be323a214a39e9cf65fcb200c80ac52e0e7c4

We need more steps to properly switch from multi-site to single-site
---
 spec/lib/backup_restore/restorer_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index b1e6e83ee9..cec9b157dc 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -111,8 +111,10 @@ xdescribe BackupRestore::Restorer do
       described_class.any_instance.stubs(initialize_state: true)
     end
     after do
+      ActiveRecord::Base.clear_all_connections!
+      Rails.configuration.multisite = false
       RailsMultisite::ConnectionManagement.clear_settings!
-      conn.establish_connection(db: 'default')
+      ActiveRecord::Base.establish_connection
     end
     let(:conn) { RailsMultisite::ConnectionManagement }
     let(:restorer) { described_class.new(admin.id) }

From 2e979a4681f29532ee5c3a8c41b49e11d815af58 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 29 Oct 2019 11:58:00 +0000
Subject: [PATCH 213/328] DEV: Passing the list options to page_params is
 unnecessary

They are always merged with the result before being used.
---
 app/controllers/list_controller.rb | 19 ++++++++-----------
 app/controllers/tags_controller.rb | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index fad041f4b9..681af70ec2 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -316,28 +316,25 @@ class ListController < ApplicationController
 
   protected
 
-  def next_page_params(opts = nil)
-    page_params(opts).merge(page: params[:page].to_i + 1)
+  def next_page_params
+    page_params.merge(page: params[:page].to_i + 1)
   end
 
-  def prev_page_params(opts = nil)
+  def prev_page_params
     pg = params[:page].to_i
     if pg > 1
-      page_params(opts).merge(page: pg - 1)
+      page_params.merge(page: pg - 1)
     else
-      page_params(opts).merge(page: nil)
+      page_params.merge(page: nil)
     end
   end
 
   private
 
-  def page_params(opts = nil)
-    opts ||= {}
+  def page_params
     route_params = { format: 'json' }
     route_params[:category]        = @category.slug_for_url                  if @category
     route_params[:parent_category] = @category.parent_category.slug_for_url  if @category && @category.parent_category
-    route_params[:order]           = opts[:order]                            if opts[:order].present?
-    route_params[:ascending]       = opts[:ascending]                        if opts[:ascending].present?
     route_params[:username]        = UrlHelper.escape_uri(params[:username]) if params[:username].present?
     route_params
   end
@@ -392,9 +389,9 @@ class ListController < ApplicationController
   def construct_url_with(action, opts, url_prefix = nil)
     method = url_prefix.blank? ? "#{action_name}_path" : "#{url_prefix}_#{action_name}_path"
     url = if action == :prev
-      public_send(method, opts.merge(prev_page_params(opts)))
+      public_send(method, opts.merge(prev_page_params))
     else # :next
-      public_send(method, opts.merge(next_page_params(opts)))
+      public_send(method, opts.merge(next_page_params))
     end
     url.sub('.json?', '?')
   end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 91439d66d1..19629600ae 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -305,26 +305,23 @@ class TagsController < ::ApplicationController
   end
 
   # TODO: this is duplication of ListController
-  def page_params(opts = nil)
-    opts ||= {}
+  def page_params
     route_params = { format: 'json' }
     route_params[:category]        = @filter_on_category.slug_for_url                 if @filter_on_category
     route_params[:parent_category] = @filter_on_category.parent_category.slug_for_url if @filter_on_category && @filter_on_category.parent_category
-    route_params[:order]           = opts[:order]      if opts[:order].present?
-    route_params[:ascending]       = opts[:ascending]  if opts[:ascending].present?
     route_params
   end
 
-  def next_page_params(opts = nil)
-    page_params(opts).merge(page: params[:page].to_i + 1)
+  def next_page_params
+    page_params.merge(page: params[:page].to_i + 1)
   end
 
-  def prev_page_params(opts = nil)
+  def prev_page_params
     pg = params[:page].to_i
     if pg > 1
-      page_params(opts).merge(page: pg - 1)
+      page_params.merge(page: pg - 1)
     else
-      page_params(opts).merge(page: nil)
+      page_params.merge(page: nil)
     end
   end
 
@@ -343,9 +340,9 @@ class TagsController < ::ApplicationController
 
     begin
       url = if action == :prev
-        public_send(method, opts.merge(prev_page_params(opts)))
+        public_send(method, opts.merge(prev_page_params))
       else # :next
-        public_send(method, opts.merge(next_page_params(opts)))
+        public_send(method, opts.merge(next_page_params))
       end
     rescue ActionController::UrlGenerationError
       raise Discourse::NotFound

From 29e41dc511d6dc81dd05f56905179982c7d925da Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 29 Oct 2019 13:32:42 +0000
Subject: [PATCH 214/328] Revert "DEV: Mark flaky tests as pending"

This reverts commit 0c475297136cbe15437e93c86a4656f43ba5f783.
---
 spec/lib/backup_restore/restorer_spec.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index cec9b157dc..c1144c431b 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -2,8 +2,7 @@
 
 require 'rails_helper'
 
-# This causes flakiness
-xdescribe BackupRestore::Restorer do
+describe BackupRestore::Restorer do
   it 'detects which pg_dump output is restorable to different schemas' do
     {
       "9.6.7" => true,

From 0a499966e95648d6d1a0aa70f3fc5180419adb4f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 29 Oct 2019 12:01:45 -0500
Subject: [PATCH 215/328] DEV: Refactor setting component save callback (#8261)

* DEV: Refactor setting component save callback

* refactor site-setting component around new callback

* add callback to theme-translation component

* remove the save callback altogether
---
 .../admin/components/site-setting.js.es6      | 12 +++----
 .../components/theme-setting-editor.js.es6    | 19 +++++------
 .../admin/mixins/setting-component.js.es6     | 32 +++++++++----------
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 227d7e9908..0b717f7223 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -6,7 +6,7 @@ import showModal from "discourse/lib/show-modal";
 import AboutRoute from "discourse/routes/about";
 
 export default Component.extend(BufferedContent, SettingComponent, {
-  _save(callback) {
+  _save() {
     const defaultCategoriesSettings = [
       "default_categories_watching",
       "default_categories_tracking",
@@ -30,15 +30,13 @@ export default Component.extend(BufferedContent, SettingComponent, {
           });
 
           controller.set("onClose", () => {
-            callback(
-              SiteSetting.update(key, value, {
-                updateExistingUsers: controller.updateExistingUsers
-              })
-            );
+            return SiteSetting.update(key, value, {
+              updateExistingUsers: controller.updateExistingUsers
+            });
           });
         });
     } else {
-      callback(SiteSetting.update(key, value));
+      return SiteSetting.update(key, value);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6 b/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
index a99b819466..e0ebe6ccdd 100644
--- a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
+++ b/app/assets/javascripts/admin/components/theme-setting-editor.js.es6
@@ -2,20 +2,17 @@ import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SettingComponent from "admin/mixins/setting-component";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend(BufferedContent, SettingComponent, {
   layoutName: "admin/templates/components/site-setting",
 
-  _save(callback) {
-    callback(
-      ajax(`/admin/themes/${this.model.id}/setting`, {
-        type: "PUT",
-        data: {
-          name: this.setting.setting,
-          value: this.get("buffered.value")
-        }
-      }).catch(popupAjaxError)
-    );
+  _save() {
+    return ajax(`/admin/themes/${this.model.id}/setting`, {
+      type: "PUT",
+      data: {
+        name: this.setting.setting,
+        value: this.get("buffered.value")
+      }
+    });
   }
 });
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 97873a2bd8..c25efa99db 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -111,23 +111,21 @@ export default Ember.Mixin.create({
 
   actions: {
     save() {
-      this._save(result => {
-        result
-          .then(() => {
-            this.set("validationMessage", null);
-            this.commitBuffer();
-            if (AUTO_REFRESH_ON_SAVE.includes(this.setting.setting)) {
-              this.afterSave();
-            }
-          })
-          .catch(e => {
-            if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-              this.set("validationMessage", e.jqXHR.responseJSON.errors[0]);
-            } else {
-              this.set("validationMessage", I18n.t("generic_error"));
-            }
-          });
-      });
+      this._save()
+        .then(() => {
+          this.set("validationMessage", null);
+          this.commitBuffer();
+          if (AUTO_REFRESH_ON_SAVE.includes(this.setting.setting)) {
+            this.afterSave();
+          }
+        })
+        .catch(e => {
+          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+            this.set("validationMessage", e.jqXHR.responseJSON.errors[0]);
+          } else {
+            this.set("validationMessage", I18n.t("generic_error"));
+          }
+        });
     },
 
     cancel() {

From a99c705c217f2a6a7a913690fa6759889698bc5c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 13:13:31 -0400
Subject: [PATCH 216/328] REFACTOR: Replace `Ember.controller.inject` with
 import

Puts it more in line with updated ember code
---
 .../admin/controllers/admin-backups-index.js.es6           | 3 ++-
 .../admin/controllers/admin-backups-logs.js.es6            | 3 ++-
 .../javascripts/admin/controllers/admin-badges-show.js.es6 | 3 ++-
 .../admin/controllers/admin-dashboard-general.js.es6       | 3 ++-
 .../javascripts/admin/controllers/admin-dashboard.js.es6   | 3 ++-
 .../admin/controllers/admin-site-settings-category.js.es6  | 3 ++-
 .../javascripts/admin/controllers/admin-user-badges.js.es6 | 3 ++-
 .../admin/controllers/admin-watched-words-action.js.es6    | 3 ++-
 .../admin/controllers/admin-web-hooks-show.js.es6          | 3 ++-
 .../admin/controllers/modals/admin-add-upload.js.es6       | 3 ++-
 .../modals/admin-color-scheme-select-base.js.es6           | 3 ++-
 .../admin/controllers/modals/admin-install-theme.js.es6    | 5 +++--
 .../admin/controllers/modals/admin-start-backup.js.es6     | 3 ++-
 app/assets/javascripts/discourse-loader.js                 | 5 ++++-
 .../discourse/controllers/activation-edit.js.es6           | 3 ++-
 .../javascripts/discourse/controllers/badges/show.js.es6   | 3 ++-
 .../discourse/controllers/bulk-notification-level.js.es6   | 3 ++-
 .../javascripts/discourse/controllers/change-owner.js.es6  | 3 ++-
 .../discourse/controllers/change-timestamp.js.es6          | 3 ++-
 .../javascripts/discourse/controllers/composer.js.es6      | 3 ++-
 .../discourse/controllers/create-account.js.es6            | 3 ++-
 .../discourse/controllers/discovery-sortable.js.es6        | 3 ++-
 .../javascripts/discourse/controllers/discovery.js.es6     | 7 ++++---
 .../discourse/controllers/discovery/categories.js.es6      | 3 ++-
 .../discourse/controllers/discovery/topics.js.es6          | 5 +++--
 .../javascripts/discourse/controllers/feature-topic.js.es6 | 3 ++-
 .../discourse/controllers/full-page-search.js.es6          | 5 +++--
 .../javascripts/discourse/controllers/grant-badge.js.es6   | 3 ++-
 .../discourse/controllers/group-activity-posts.js.es6      | 7 ++++---
 .../javascripts/discourse/controllers/group-index.js.es6   | 3 ++-
 .../discourse/controllers/group-manage-logs.js.es6         | 5 +++--
 .../discourse/controllers/group-requests.js.es6            | 3 ++-
 app/assets/javascripts/discourse/controllers/group.js.es6  | 3 ++-
 .../javascripts/discourse/controllers/groups-index.js.es6  | 3 ++-
 app/assets/javascripts/discourse/controllers/login.js.es6  | 7 ++++---
 .../javascripts/discourse/controllers/move-to-topic.js.es6 | 3 ++-
 .../discourse/controllers/navigation/categories.js.es6     | 3 ++-
 .../discourse/controllers/navigation/default.js.es6        | 5 +++--
 .../discourse/controllers/preferences/interface.js.es6     | 3 ++-
 app/assets/javascripts/discourse/controllers/static.js.es6 | 3 ++-
 .../discourse/controllers/tag-groups-show.js.es6           | 3 ++-
 .../javascripts/discourse/controllers/tags-show.js.es6     | 3 ++-
 app/assets/javascripts/discourse/controllers/topic.js.es6  | 5 +++--
 .../javascripts/discourse/controllers/user-activity.js.es6 | 5 +++--
 .../javascripts/discourse/controllers/user-badges.js.es6   | 3 ++-
 .../javascripts/discourse/controllers/user-card.js.es6     | 3 ++-
 .../discourse/controllers/user-notifications.js.es6        | 3 ++-
 .../javascripts/discourse/controllers/user-posts.js.es6    | 3 ++-
 .../discourse/controllers/user-private-messages.js.es6     | 5 +++--
 .../javascripts/discourse/controllers/user-summary.js.es6  | 3 ++-
 .../discourse/controllers/user-topics-list.js.es6          | 3 ++-
 app/assets/javascripts/discourse/controllers/user.js.es6   | 3 ++-
 app/assets/javascripts/discourse/controllers/users.js.es6  | 3 ++-
 53 files changed, 122 insertions(+), 67 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 b71a45c57d..cfda2e5cdc 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { setting, i18n } from "discourse/lib/computed";
 
 export default Controller.extend({
-  adminBackups: Ember.inject.controller(),
+  adminBackups: inject(),
   status: Ember.computed.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 4887c779e6..92d95547d0 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  adminBackups: Ember.inject.controller(),
+  adminBackups: inject(),
   status: Ember.computed.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 254f9918f5..caac995c96 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -5,7 +6,7 @@ import { propertyNotEqual } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend(bufferedProperty("model"), {
-  adminBadges: Ember.inject.controller(),
+  adminBadges: inject(),
   saving: false,
   savingStatus: "",
 
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
index 54916ed715..fed8d80edf 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -16,7 +17,7 @@ function staticReport(reportType) {
 export default Controller.extend(PeriodComputationMixin, {
   isLoading: false,
   dashboardFetchedAt: null,
-  exceptionController: Ember.inject.controller("exception"),
+  exceptionController: inject("exception"),
   logSearchQueriesEnabled: setting("log_search_queries"),
   basePath: Discourse.BaseUri,
 
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 53a97a6304..6b20eb2e6b 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -9,7 +10,7 @@ const PROBLEMS_CHECK_MINUTES = 1;
 export default Controller.extend({
   isLoading: false,
   dashboardFetchedAt: null,
-  exceptionController: Ember.inject.controller("exception"),
+  exceptionController: inject("exception"),
   showVersionChecks: setting("version_checks"),
 
   @computed("problems.length")
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 7d4f33a1ac..ec2811b162 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,9 +1,10 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
   categoryNameKey: null,
-  adminSiteSettings: Ember.inject.controller(),
+  adminSiteSettings: inject(),
 
   @computed("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 36dbf57f8d..7f51d8efd8 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend(GrantBadgeController, {
-  adminUser: Ember.inject.controller(),
+  adminUser: inject(),
   user: Ember.computed.alias("adminUser.model"),
   userBadges: Ember.computed.alias("model"),
   allBadges: Ember.computed.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 632f84ec60..dcfd5d53c3 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,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import WatchedWord from "admin/models/watched-word";
@@ -7,7 +8,7 @@ import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   actionNameKey: null,
-  adminWatchedWords: Ember.inject.controller(),
+  adminWatchedWords: inject(),
   showWordsList: Ember.computed.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 2409e7c7db..2231897882 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,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
@@ -5,7 +6,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
 export default Controller.extend({
-  adminWebHooks: Ember.inject.controller(),
+  adminWebHooks: inject(),
   eventTypes: Ember.computed.alias("adminWebHooks.eventTypes"),
   defaultEventTypes: Ember.computed.alias("adminWebHooks.defaultEventTypes"),
   contentTypes: Ember.computed.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 daad10549e..c79756aa53 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,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
@@ -54,7 +55,7 @@ const SCSS_VARIABLE_NAMES = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  adminCustomizeThemesShow: Ember.inject.controller(),
+  adminCustomizeThemesShow: inject(),
 
   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 80f57d9a18..e2ae049390 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,8 +1,9 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
-  adminCustomizeColors: Ember.inject.controller(),
+  adminCustomizeColors: inject(),
 
   actions: {
     selectBase() {
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 84cccd52ae..d62fef5a1b 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,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
@@ -17,7 +18,7 @@ export default Controller.extend(ModalFunctionality, {
   remote: Ember.computed.equal("selection", "remote"),
   create: Ember.computed.equal("selection", "create"),
   selection: "popular",
-  adminCustomizeThemes: Ember.inject.controller(),
+  adminCustomizeThemes: inject(),
   loading: false,
   keyGenUrl: "/admin/themes/generate_key_pair",
   importUrl: "/admin/themes/import",
@@ -27,7 +28,7 @@ export default Controller.extend(ModalFunctionality, {
   uploadUrl: null,
   urlPlaceholder: "https://github.com/discourse/sample_theme",
   advancedVisible: false,
-  themesController: Ember.inject.controller("adminCustomizeThemes"),
+  themesController: inject("adminCustomizeThemes"),
   selectedType: Ember.computed.alias("themesController.currentTab"),
   component: Ember.computed.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 9a321c2348..8324a8d737 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,8 +1,9 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
-  adminBackupsLogs: Ember.inject.controller(),
+  adminBackupsLogs: inject(),
 
   actions: {
     startBackupWithUploads() {
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 7831db85c8..b5f360228c 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -7,7 +7,10 @@ var define, requirejs;
     EMBER_MODULES = {
       jquery: { default: $ },
       "@ember/component": { default: Ember.Component },
-      "@ember/controller": { default: Ember.Controller },
+      "@ember/controller": {
+        default: Ember.Controller,
+        inject: Ember.inject.controller
+      },
       "@ember/object": { default: Ember.Object },
       "@ember/routing/route": { default: Ember.Route }
     };
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
index c44c25ca1f..a28c882206 100644
--- a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -5,7 +6,7 @@ import { extractError } from "discourse/lib/ajax-error";
 import { changeEmail } from "discourse/lib/user-activation";
 
 export default Controller.extend(ModalFunctionality, {
-  login: Ember.inject.controller(),
+  login: inject(),
 
   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 3de5ac6cb0..d2fe0ae0ce 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
@@ -10,7 +11,7 @@ export default Controller.extend({
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,
-  application: Ember.inject.controller(),
+  application: inject(),
   hiddenSetTitle: true,
 
   @computed("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 fe4c255645..39ace60b1e 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
 export default Controller.extend({
-  topicBulkActions: Ember.inject.controller(),
+  topicBulkActions: inject(),
   notificationLevelId: null,
 
   @computed
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 40fa8bc15b..f6273ec780 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
 
   saving: false,
   new_user: null,
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index cd02a1a32b..91554344dc 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
@@ -6,7 +7,7 @@ import Topic from "discourse/models/topic";
 
 // Modal related to changing the timestamp of posts
 export default Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   saving: false,
   date: "",
   time: "",
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index dbc9a59f9a..a011e8212f 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import Quote from "discourse/lib/quote";
@@ -76,7 +77,7 @@ export function addPopupMenuOptionsCallback(callback) {
 }
 
 export default Controller.extend({
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   router: Ember.inject.service(),
 
   checkedMessages: false,
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 42d3c40147..e5eb9fdf20 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 { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -22,7 +23,7 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
-    login: Ember.inject.controller(),
+    login: inject(),
 
     complete: false,
     accountChallenge: 0,
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index 643caff533..587e73f478 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import DiscourseNavigation from "discourse/components/d-navigation";
 
@@ -17,7 +18,7 @@ export const queryParams = {
 
 // Basic controller options
 const controllerOpts = {
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  discoveryTopics: inject("discovery/topics"),
   queryParams: Object.keys(queryParams)
 };
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 075b47ee60..d0fc7fe5d1 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 
 export default Controller.extend({
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
-  navigationCategory: Ember.inject.controller("navigation/category"),
-  application: Ember.inject.controller(),
+  discoveryTopics: inject("discovery/topics"),
+  navigationCategory: inject("navigation/category"),
+  application: inject(),
 
   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 2d8cc9f9ed..f5b07d40c2 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import computed from "ember-addons/ember-computed-decorators";
 import DiscoveryController from "discourse/controllers/discovery";
 
@@ -9,7 +10,7 @@ const subcategoryStyleComponentNames = {
 };
 
 export default DiscoveryController.extend({
-  discovery: Ember.inject.controller(),
+  discovery: inject(),
 
   // 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 c6443bd37e..34ac6a2504 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import DiscoveryController from "discourse/controllers/discovery";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
@@ -8,8 +9,8 @@ import TopicList from "discourse/models/topic-list";
 import computed from "ember-addons/ember-computed-decorators";
 
 const controllerOpts = {
-  discovery: Ember.inject.controller(),
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  discovery: inject(),
+  discoveryTopics: inject("discovery/topics"),
 
   period: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index 231b3cac08..6fe1d2003b 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -6,7 +7,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
 export default Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
 
   loading: true,
   pinnedInCategoryCount: 0,
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 bfe34bea92..6a2028a783 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -26,8 +27,8 @@ const SortOrders = [
 const PAGE_LIMIT = 10;
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
-  composer: Ember.inject.controller(),
+  application: inject(),
+  composer: inject(),
   bulkSelectEnabled: null,
 
   loading: false,
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
index 2313ae5d3f..2508c03d3e 100644
--- a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 
 export default Controller.extend(ModalFunctionality, GrantBadgeController, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   loading: true,
   saving: false,
   selectedBadgeId: null,
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 32c284f3e2..b5ddb6e723 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,11 +1,12 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
 export default Controller.extend({
-  group: Ember.inject.controller(),
-  groupActivity: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  group: inject(),
+  groupActivity: inject(),
+  application: inject(),
   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 7dad9329d1..f6f8b15f1c 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
@@ -18,7 +19,7 @@ export default Controller.extend({
   showActions: false,
   filter: null,
   filterInput: null,
-  application: Ember.inject.controller(),
+  application: inject(),
 
   @observes("filterInput")
   _setFilter: debounce(function() {
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 87b0a01ecf..42df4d51b6 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import {
   default as computed,
@@ -5,10 +6,10 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  group: Ember.inject.controller(),
+  group: inject(),
   loading: false,
   offset: 0,
-  application: Ember.inject.controller(),
+  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 3c29622ea9..4afb552a99 100644
--- a/app/assets/javascripts/discourse/controllers/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -17,7 +18,7 @@ export default Controller.extend({
   offset: null,
   filter: null,
   filterInput: null,
-  application: Ember.inject.controller(),
+  application: inject(),
 
   @observes("filterInput")
   _setFilter: debounce(function() {
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index d555c7c161..42b37715d2 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
@@ -11,7 +12,7 @@ const Tab = Ember.Object.extend({
 });
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   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 a689dfa7bd..d1be152cd0 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import {
@@ -6,7 +7,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   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 feaffe8fdf..d2bd29b540 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -21,9 +22,9 @@ const AuthErrors = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  createAccount: Ember.inject.controller(),
-  forgotPassword: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  createAccount: inject(),
+  forgotPassword: inject(),
+  application: inject(),
 
   loggingIn: false,
   loggedIn: false,
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 195dc93322..4c9e0f7ba1 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { movePosts, mergeTopic } from "discourse/models/topic";
@@ -37,7 +38,7 @@ export default Controller.extend(ModalFunctionality, {
     ];
   },
 
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   selectedPostsCount: Ember.computed.alias(
     "topicController.selectedPostsCount"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
index ee6066f186..37965c0a58 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
@@ -1,8 +1,9 @@
+import { inject } from '@ember/controller';
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default NavigationDefaultController.extend({
-  discoveryCategories: Ember.inject.controller("discovery/categories"),
+  discoveryCategories: inject("discovery/categories"),
 
   @computed("discoveryCategories.model", "discoveryCategories.model.draft")
   draft() {
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 036f4174a2..339e81e2ab 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,9 +1,10 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  discovery: Ember.inject.controller(),
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  discovery: inject(),
+  discoveryTopics: inject("discovery/topics"),
 
   @computed("discoveryTopics.model", "discoveryTopics.model.draft")
   draft: function() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index b678d7076b..e499143412 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
@@ -52,7 +53,7 @@ export default Controller.extend(PreferencesTabController, {
     return attrs;
   },
 
-  preferencesController: Ember.inject.controller("preferences"),
+  preferencesController: inject("preferences"),
 
   @computed()
   isiPad() {
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 65c8de32bf..ba43715114 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 import { userPath } from "discourse/lib/url";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   showLoginButton: Ember.computed.equal("model.path", "login"),
 
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
index 725b088db1..409394e1e0 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  tagGroups: Ember.inject.controller(),
+  tagGroups: inject(),
 
   actions: {
     save() {
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index abd2798d26..e5901cf757 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import {
   default as computed,
@@ -50,7 +51,7 @@ if (customNavItemHref) {
 }
 
 export default Controller.extend(BulkTopicSelection, {
-  application: Ember.inject.controller(),
+  application: inject(),
 
   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 f62884e3dc..a14016300c 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
@@ -35,8 +36,8 @@ export function registerCustomPostMessageCallback(type, callback) {
 }
 
 export default Controller.extend(bufferedProperty("model"), {
-  composer: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  composer: inject(),
+  application: inject(),
   multiSelect: false,
   selectedPostIds: null,
   editingTopic: false,
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index c82155802a..498f3ff801 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   router: Ember.inject.service(),
-  user: Ember.inject.controller(),
+  user: inject(),
   userActionType: null,
 
   canDownloadPosts: Ember.computed.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 49b9c006a5..a6eeaa6358 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  user: Ember.inject.controller(),
+  user: inject(),
   username: Ember.computed.alias("user.model.username_lower"),
   sortedBadges: Ember.computed.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 1d59df2319..4f65d3f9d8 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import {
   default as DiscourseURL,
@@ -6,7 +7,7 @@ import {
 } from "discourse/lib/url";
 
 export default Controller.extend({
-  topic: Ember.inject.controller(),
+  topic: inject(),
   router: Ember.inject.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 e309e9349b..383a0df85f 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -6,7 +7,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   @observes("model.canLoadMore")
   _showFooter() {
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index d60f93f45c..78875a55bd 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   _showFooter: function() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
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 cb4919867a..e10ea776ba 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,11 +1,12 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import Topic from "discourse/models/topic";
 
 export default Controller.extend({
   router: Ember.inject.service(),
-  userTopicsList: Ember.inject.controller("user-topics-list"),
-  user: Ember.inject.controller(),
+  userTopicsList: inject("user-topics-list"),
+  user: inject(),
 
   pmView: false,
   viewingSelf: Ember.computed.alias("user.viewingSelf"),
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index 1f4ba939f2..fa30318445 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { durationTiny } from "discourse/lib/formatter";
@@ -6,7 +7,7 @@ import { durationTiny } from "discourse/lib/formatter";
 const MAX_BADGES = 6;
 
 export default Controller.extend({
-  userController: Ember.inject.controller("user"),
+  userController: inject("user"),
   user: Ember.computed.alias("userController.model"),
 
   @computed("model.badges.length")
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 b7b1bb7d12..241d5e2ac5 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,9 +1,10 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 // Lists of topics on a user's page.
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   hideCategory: false,
   showPosters: false,
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index f1f90bfa94..a63954203b 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import computed from "ember-addons/ember-computed-decorators";
@@ -8,7 +9,7 @@ import { prioritizeNameInUx } from "discourse/lib/settings";
 export default Controller.extend(CanCheckEmails, {
   indexStream: false,
   router: Ember.inject.service(),
-  userNotifications: Ember.inject.controller("user-notifications"),
+  userNotifications: inject("user-notifications"),
   currentPath: Ember.computed.alias("router._router.currentPath"),
   adminTools: optionalService(),
 
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 61476963a0..5df64db63e 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,8 +1,9 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   queryParams: ["period", "order", "asc", "name", "group", "exclude_usernames"],
   period: "weekly",
   order: "likes_received",

From 230541c975f254833d3201b485abcdd083119846 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 13:29:08 -0400
Subject: [PATCH 217/328] REFACTOR: Use Ember modules for `@ember/service`

---
 .../javascripts/admin/controllers/admin-user-index.js.es6   | 3 ++-
 app/assets/javascripts/admin/controllers/admin.js.es6       | 3 ++-
 app/assets/javascripts/admin/services/admin-tools.js.es6    | 3 ++-
 app/assets/javascripts/discourse-loader.js                  | 6 +++++-
 app/assets/javascripts/discourse/components/d-editor.js.es6 | 3 ++-
 .../javascripts/discourse/components/d-navigation.js.es6    | 3 ++-
 .../javascripts/discourse/components/emoji-picker.js.es6    | 3 ++-
 app/assets/javascripts/discourse/components/nav-item.js.es6 | 3 ++-
 .../javascripts/discourse/controllers/application.js.es6    | 3 ++-
 .../javascripts/discourse/controllers/composer.js.es6       | 3 ++-
 .../javascripts/discourse/controllers/group-activity.js.es6 | 3 ++-
 .../javascripts/discourse/controllers/group-manage.js.es6   | 3 ++-
 .../javascripts/discourse/controllers/group-messages.js.es6 | 3 ++-
 .../javascripts/discourse/controllers/preferences.js.es6    | 3 ++-
 .../javascripts/discourse/controllers/user-activity.js.es6  | 3 ++-
 .../javascripts/discourse/controllers/user-card.js.es6      | 5 +++--
 .../discourse/controllers/user-private-messages.js.es6      | 3 ++-
 app/assets/javascripts/discourse/controllers/user.js.es6    | 3 ++-
 app/assets/javascripts/discourse/services/app-events.js.es6 | 3 ++-
 .../javascripts/discourse/services/emoji-store.js.es6       | 3 ++-
 .../javascripts/discourse/services/theme-settings.js.es6    | 4 +++-
 21 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index e086d85374..9dfb5ae8bc 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
@@ -8,7 +9,7 @@ import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
 export default Controller.extend(CanCheckEmails, {
-  adminTools: Ember.inject.service(),
+  adminTools: service(),
   originalPrimaryGroupId: null,
   customGroupIdsBuffer: null,
   availableGroups: null,
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index 52ecf0a70b..14174efe1f 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,8 +1,9 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  router: Ember.inject.service(),
+  router: service(),
 
   @computed("siteSettings.enable_group_directory")
   showGroups(enableGroupDirectory) {
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
index 7f3b4d88a8..b8d0e6e805 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js.es6
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -7,8 +7,9 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import { getOwner } from "discourse-common/lib/get-owner";
+import Service from "@ember/service";
 
-export default Ember.Service.extend({
+export default Service.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index b5f360228c..f11b583d42 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -12,7 +12,11 @@ var define, requirejs;
         inject: Ember.inject.controller
       },
       "@ember/object": { default: Ember.Object },
-      "@ember/routing/route": { default: Ember.Route }
+      "@ember/routing/route": { default: Ember.Route },
+      "@ember/service": {
+        default: Ember.Service,
+        inject: Ember.inject.service
+      }
     };
   }
 
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 1657552555..3065269b70 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import Component from "@ember/component";
 /*global Mousetrap:true */
 import {
@@ -219,7 +220,7 @@ export default Component.extend({
   _mouseTrap: null,
   showLink: true,
   emojiPickerIsActive: false,
-  emojiStore: Ember.inject.service("emoji-store"),
+  emojiStore: service("emoji-store"),
 
   @computed("placeholder")
   placeholderTranslated(placeholder) {
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js.es6
index f7358ec15b..7939eb6657 100644
--- a/app/assets/javascripts/discourse/components/d-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/d-navigation.js.es6
@@ -1,8 +1,9 @@
+import { inject as service } from '@ember/service';
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Component.extend({
-  router: Ember.inject.service(),
+  router: service(),
   persistedQueryParams: null,
 
   tagName: "",
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 614db00529..d1337d9f67 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
@@ -18,7 +19,7 @@ const customEmojis = _.keys(extendedEmojiList()).map(code => {
 
 export default Component.extend({
   automaticPositioning: true,
-  emojiStore: Ember.inject.service("emoji-store"),
+  emojiStore: service("emoji-store"),
 
   close() {
     this._unbindEvents();
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6
index 556c808585..ab2a86a67c 100644
--- a/app/assets/javascripts/discourse/components/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/components/nav-item.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import Component from "@ember/component";
 /* You might be looking for navigation-item. */
 import { iconHTML } from "discourse-common/lib/icon-library";
@@ -6,7 +7,7 @@ import computed from "ember-addons/ember-computed-decorators";
 export default Component.extend({
   tagName: "li",
   classNameBindings: ["active"],
-  router: Ember.inject.service(),
+  router: service(),
 
   @computed("label", "i18nLabel", "icon")
   contents(label, i18nLabel, icon) {
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index e0a5d5c90a..8a6f1b06ce 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
@@ -5,7 +6,7 @@ import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
 export default Controller.extend({
   showTop: true,
   showFooter: false,
-  router: Ember.inject.service(),
+  router: service(),
 
   @computed
   canSignUp() {
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index a011e8212f..92801c6b56 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
@@ -78,7 +79,7 @@ export function addPopupMenuOptionsCallback(callback) {
 
 export default Controller.extend({
   topicController: inject("topic"),
-  router: Ember.inject.service(),
+  router: service(),
 
   checkedMessages: false,
   messageCount: null,
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index 838045d206..893fbc69d9 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -1,5 +1,6 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  router: Ember.inject.service(),
+  router: service(),
   queryParams: ["category_id"]
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
index 662887935a..b1cf11a2c9 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -1,8 +1,9 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  router: Ember.inject.service(),
+  router: service(),
 
   @computed("model.automatic")
   tabs(automatic) {
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
index 4cecbd3701..f104980c03 100644
--- a/app/assets/javascripts/discourse/controllers/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
@@ -1,4 +1,5 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  router: Ember.inject.service()
+  router: service()
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index 4cecbd3701..f104980c03 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -1,4 +1,5 @@
+import { inject as service } from '@ember/service';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  router: Ember.inject.service()
+  router: service()
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 498f3ff801..113076bc62 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,10 +1,11 @@
+import { inject as service } from '@ember/service';
 import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 
 export default Controller.extend({
   application: inject(),
-  router: Ember.inject.service(),
+  router: service(),
   user: inject(),
   userActionType: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 4f65d3f9d8..d0fa3abf1c 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -1,4 +1,5 @@
-import { inject } from '@ember/controller';
+import { inject as service } from "@ember/service";
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import {
   default as DiscourseURL,
@@ -8,7 +9,7 @@ import {
 
 export default Controller.extend({
   topic: inject(),
-  router: Ember.inject.service(),
+  router: service(),
 
   actions: {
     togglePosts(user) {
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 e10ea776ba..cbce745280 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,10 +1,11 @@
+import { inject as service } from '@ember/service';
 import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import Topic from "discourse/models/topic";
 
 export default Controller.extend({
-  router: Ember.inject.service(),
+  router: service(),
   userTopicsList: inject("user-topics-list"),
   user: inject(),
 
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index a63954203b..6913555c2f 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,3 +1,4 @@
+import { inject as service } from '@ember/service';
 import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
@@ -8,7 +9,7 @@ import { prioritizeNameInUx } from "discourse/lib/settings";
 
 export default Controller.extend(CanCheckEmails, {
   indexStream: false,
-  router: Ember.inject.service(),
+  router: service(),
   userNotifications: inject("user-notifications"),
   currentPath: Ember.computed.alias("router._router.currentPath"),
   adminTools: optionalService(),
diff --git a/app/assets/javascripts/discourse/services/app-events.js.es6 b/app/assets/javascripts/discourse/services/app-events.js.es6
index 5967568ef3..fa73e9d463 100644
--- a/app/assets/javascripts/discourse/services/app-events.js.es6
+++ b/app/assets/javascripts/discourse/services/app-events.js.es6
@@ -1,6 +1,7 @@
 import deprecated from "discourse-common/lib/deprecated";
+import Service from "@ember/service";
 
-export default Ember.Service.extend(Ember.Evented, {
+export default Service.extend(Ember.Evented, {
   _events: {},
 
   on() {
diff --git a/app/assets/javascripts/discourse/services/emoji-store.js.es6 b/app/assets/javascripts/discourse/services/emoji-store.js.es6
index 7c7a5d082a..19fbd662fc 100644
--- a/app/assets/javascripts/discourse/services/emoji-store.js.es6
+++ b/app/assets/javascripts/discourse/services/emoji-store.js.es6
@@ -1,11 +1,12 @@
 import KeyValueStore from "discourse/lib/key-value-store";
+import Service from "@ember/service";
 
 const EMOJI_USAGE = "emojiUsage";
 const EMOJI_SELECTED_DIVERSITY = "emojiSelectedDiversity";
 const TRACKED_EMOJIS = 15;
 const STORE_NAMESPACE = "discourse_emojis_";
 
-export default Ember.Service.extend({
+export default Service.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/services/theme-settings.js.es6 b/app/assets/javascripts/discourse/services/theme-settings.js.es6
index 1ff2300f7f..5ebe9f3705 100644
--- a/app/assets/javascripts/discourse/services/theme-settings.js.es6
+++ b/app/assets/javascripts/discourse/services/theme-settings.js.es6
@@ -1,4 +1,6 @@
-export default Ember.Service.extend({
+import Service from "@ember/service";
+
+export default Service.extend({
   settings: null,
 
   init() {

From 356e2a4b4a357fb04705e344ae885378a889fc5a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 13:31:44 -0400
Subject: [PATCH 218/328] FIX: Linting

---
 .../javascripts/admin/controllers/admin-backups-index.js.es6  | 2 +-
 .../javascripts/admin/controllers/admin-backups-logs.js.es6   | 2 +-
 .../javascripts/admin/controllers/admin-badges-show.js.es6    | 2 +-
 .../admin/controllers/admin-dashboard-general.js.es6          | 2 +-
 .../javascripts/admin/controllers/admin-dashboard.js.es6      | 2 +-
 .../admin/controllers/admin-site-settings-category.js.es6     | 2 +-
 .../javascripts/admin/controllers/admin-user-badges.js.es6    | 2 +-
 .../javascripts/admin/controllers/admin-user-index.js.es6     | 2 +-
 .../admin/controllers/admin-watched-words-action.js.es6       | 2 +-
 .../javascripts/admin/controllers/admin-web-hooks-show.js.es6 | 2 +-
 app/assets/javascripts/admin/controllers/admin.js.es6         | 2 +-
 .../admin/controllers/modals/admin-add-upload.js.es6          | 2 +-
 .../controllers/modals/admin-color-scheme-select-base.js.es6  | 2 +-
 .../admin/controllers/modals/admin-install-theme.js.es6       | 2 +-
 .../admin/controllers/modals/admin-start-backup.js.es6        | 2 +-
 app/assets/javascripts/discourse/components/d-editor.js.es6   | 2 +-
 .../javascripts/discourse/components/d-navigation.js.es6      | 2 +-
 .../javascripts/discourse/components/emoji-picker.js.es6      | 2 +-
 app/assets/javascripts/discourse/components/nav-item.js.es6   | 2 +-
 .../javascripts/discourse/controllers/activation-edit.js.es6  | 2 +-
 .../javascripts/discourse/controllers/application.js.es6      | 2 +-
 .../javascripts/discourse/controllers/badges/show.js.es6      | 2 +-
 .../discourse/controllers/bulk-notification-level.js.es6      | 2 +-
 .../javascripts/discourse/controllers/change-owner.js.es6     | 2 +-
 .../javascripts/discourse/controllers/change-timestamp.js.es6 | 2 +-
 app/assets/javascripts/discourse/controllers/composer.js.es6  | 4 ++--
 .../javascripts/discourse/controllers/create-account.js.es6   | 2 +-
 .../discourse/controllers/discovery-sortable.js.es6           | 2 +-
 app/assets/javascripts/discourse/controllers/discovery.js.es6 | 2 +-
 .../discourse/controllers/discovery/categories.js.es6         | 2 +-
 .../javascripts/discourse/controllers/discovery/topics.js.es6 | 2 +-
 .../javascripts/discourse/controllers/feature-topic.js.es6    | 2 +-
 .../javascripts/discourse/controllers/full-page-search.js.es6 | 2 +-
 .../javascripts/discourse/controllers/grant-badge.js.es6      | 2 +-
 .../discourse/controllers/group-activity-posts.js.es6         | 2 +-
 .../javascripts/discourse/controllers/group-activity.js.es6   | 2 +-
 .../javascripts/discourse/controllers/group-index.js.es6      | 2 +-
 .../discourse/controllers/group-manage-logs.js.es6            | 2 +-
 .../javascripts/discourse/controllers/group-manage.js.es6     | 2 +-
 .../javascripts/discourse/controllers/group-messages.js.es6   | 2 +-
 .../javascripts/discourse/controllers/group-requests.js.es6   | 2 +-
 app/assets/javascripts/discourse/controllers/group.js.es6     | 2 +-
 .../javascripts/discourse/controllers/groups-index.js.es6     | 2 +-
 app/assets/javascripts/discourse/controllers/login.js.es6     | 2 +-
 .../javascripts/discourse/controllers/move-to-topic.js.es6    | 2 +-
 .../discourse/controllers/navigation/categories.js.es6        | 2 +-
 .../discourse/controllers/navigation/default.js.es6           | 2 +-
 .../javascripts/discourse/controllers/preferences.js.es6      | 2 +-
 .../discourse/controllers/preferences/interface.js.es6        | 2 +-
 app/assets/javascripts/discourse/controllers/static.js.es6    | 2 +-
 .../javascripts/discourse/controllers/tag-groups-show.js.es6  | 2 +-
 app/assets/javascripts/discourse/controllers/tags-show.js.es6 | 2 +-
 app/assets/javascripts/discourse/controllers/topic.js.es6     | 2 +-
 .../javascripts/discourse/controllers/user-activity.js.es6    | 4 ++--
 .../javascripts/discourse/controllers/user-badges.js.es6      | 2 +-
 .../discourse/controllers/user-notifications.js.es6           | 2 +-
 .../javascripts/discourse/controllers/user-posts.js.es6       | 2 +-
 .../discourse/controllers/user-private-messages.js.es6        | 4 ++--
 .../javascripts/discourse/controllers/user-summary.js.es6     | 2 +-
 .../javascripts/discourse/controllers/user-topics-list.js.es6 | 2 +-
 app/assets/javascripts/discourse/controllers/user.js.es6      | 4 ++--
 app/assets/javascripts/discourse/controllers/users.js.es6     | 2 +-
 62 files changed, 66 insertions(+), 66 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 cfda2e5cdc..6c7249c3f9 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { default as computed } from "ember-addons/ember-computed-decorators";
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 92d95547d0..156d6f2f2a 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 export default Controller.extend({
   adminBackups: inject(),
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 caac995c96..e432a9fbca 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
index fed8d80edf..23bdbcf5f0 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 6b20eb2e6b..0f214d6f2d 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
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 ec2811b162..3fd10f15d1 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
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 7f51d8efd8..51f1787fe0 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 9dfb5ae8bc..8db8b482a9 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
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 dcfd5d53c3..be982921db 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import WatchedWord from "admin/models/watched-word";
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 2231897882..6439e3b945 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index 14174efe1f..c615169380 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
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 c79756aa53..aa77b2050e 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
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 e2ae049390..ea64338a83 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
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 d62fef5a1b..58137f6672 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
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 8324a8d737..b4cc2f188d 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,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 3065269b70..185223be34 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /*global Mousetrap:true */
 import {
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js.es6
index 7939eb6657..b44ad95efd 100644
--- a/app/assets/javascripts/discourse/components/d-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/d-navigation.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index d1337d9f67..52f9e8add4 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6
index ab2a86a67c..d648e892d3 100644
--- a/app/assets/javascripts/discourse/components/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/components/nav-item.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /* You might be looking for navigation-item. */
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
index a28c882206..8fc90f6cf0 100644
--- a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index 8a6f1b06ce..610e745e64 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index d2fe0ae0ce..e34818fe0c 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
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 39ace60b1e..e8df3c9772 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { topicLevels } from "discourse/lib/notification-levels";
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index f6273ec780..28acef583e 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 91554344dc..7744b066e1 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 92801c6b56..01867e7c6a 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,5 +1,5 @@
-import { inject as service } from '@ember/service';
-import { inject } from '@ember/controller';
+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";
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index e5eb9fdf20..b6e6755da7 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index 587e73f478..4b9afc6763 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import DiscourseNavigation from "discourse/components/d-navigation";
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index d0fc7fe5d1..5f23a85b33 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index f5b07d40c2..f0511bae37 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscoveryController from "discourse/controllers/discovery";
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 34ac6a2504..9dc0c4b98c 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import DiscoveryController from "discourse/controllers/discovery";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index 6fe1d2003b..48ca403722 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
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 6a2028a783..97b7ded953 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
index 2508c03d3e..8e88d41ad5 100644
--- a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
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 b5ddb6e723..ed648a3dec 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index 893fbc69d9..5c48daee43 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 export default Controller.extend({
   router: service(),
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index f6f8b15f1c..335a6a3b7d 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
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 42df4d51b6..123c27f4f1 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import {
   default as computed,
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
index b1cf11a2c9..dab05b6dbc 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
index f104980c03..a422a1f33c 100644
--- a/app/assets/javascripts/discourse/controllers/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 export default Controller.extend({
   router: service()
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
index 4afb552a99..246fd0cf9a 100644
--- a/app/assets/javascripts/discourse/controllers/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 42b37715d2..ee4011d939 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
index d1be152cd0..a466572b26 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import {
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index d2bd29b540..cec011b279 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 4c9e0f7ba1..8a89fc8e57 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { movePosts, mergeTopic } from "discourse/models/topic";
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
index 37965c0a58..216ca0448f 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 import computed from "ember-addons/ember-computed-decorators";
 
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 339e81e2ab..9d4d051974 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index f104980c03..a422a1f33c 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 export default Controller.extend({
   router: service()
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index e499143412..9ef7280fc2 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index ba43715114..632fe18c92 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
index 409394e1e0..9ebdef5d92 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 export default Controller.extend({
   tagGroups: inject(),
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index e5901cf757..3cccb318f3 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import {
   default as computed,
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index a14016300c..ba9afb0a96 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 113076bc62..237b06cb1d 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,5 +1,5 @@
-import { inject as service } from '@ember/service';
-import { inject } from '@ember/controller';
+import { inject as service } from "@ember/service";
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index a6eeaa6358..a19984feb0 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 export default Controller.extend({
   user: inject(),
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index 383a0df85f..ea5507cc5c 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index 78875a55bd..fe001ad1c1 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 export default Controller.extend({
   application: inject(),
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 cbce745280..d7321e37cc 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,5 +1,5 @@
-import { inject as service } from '@ember/service';
-import { inject } from '@ember/controller';
+import { inject as service } from "@ember/service";
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import Topic from "discourse/models/topic";
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index fa30318445..4dd6db5573 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { durationTiny } from "discourse/lib/formatter";
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 241d5e2ac5..5539500165 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 6913555c2f..ebe7a8bb23 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,5 +1,5 @@
-import { inject as service } from '@ember/service';
-import { inject } from '@ember/controller';
+import { inject as service } from "@ember/service";
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 5df64db63e..11521e68eb 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,4 +1,4 @@
-import { inject } from '@ember/controller';
+import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 

From 74dc37c07cb59499d3c13a868a8594e8667da447 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 29 Oct 2019 11:34:28 -0700
Subject: [PATCH 219/328] FIX: upserting custom fields using keywords converts
 the array key to a string

---
 app/models/concerns/has_custom_fields.rb      |  2 +-
 .../concern/has_custom_fields_spec.rb         | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index a98aad45b3..923efe846d 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -193,7 +193,7 @@ module HasCustomFields
       if row_count == 0
         _custom_fields.create!(name: k, value: v)
       end
-      custom_fields[k] = v
+      custom_fields[k.to_s] = v # We normalize custom_fields as strings
     end
   end
 
diff --git a/spec/components/concern/has_custom_fields_spec.rb b/spec/components/concern/has_custom_fields_spec.rb
index 5696f113f1..24ecefaca5 100644
--- a/spec/components/concern/has_custom_fields_spec.rb
+++ b/spec/components/concern/has_custom_fields_spec.rb
@@ -313,6 +313,30 @@ describe HasCustomFields do
         expect(test_item.custom_fields['hello']).to eq('world')
         expect(test_item.custom_fields['abc']).to eq('ghi')
       end
+
+      it 'allows upsert to use keywords' do
+        test_item = CustomFieldsTestItem.create
+        test_item.upsert_custom_fields(hello: 'world', abc: 'def')
+
+        # In memory
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('def')
+
+        # Persisted
+        test_item.reload
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('def')
+
+        # In memory
+        test_item.upsert_custom_fields('abc' => 'ghi')
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('ghi')
+
+        # Persisted
+        test_item.reload
+        expect(test_item.custom_fields['hello']).to eq('world')
+        expect(test_item.custom_fields['abc']).to eq('ghi')
+      end
     end
   end
 end

From c7475ee03b2a1371712dee9e22d24625263e2453 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 29 Oct 2019 14:23:50 -0500
Subject: [PATCH 220/328] DEV: Import EmberObject rather than global variable
 (#8256)

* DEV: Import ember/object rather than Ember.Object globally

* fixed broken object proxy import

* prettier on js

* added @ember/object/proxy to loader

* added unstaged file

* Fixed objet proxy reference is loader

* Linting!
---
 .../admin/components/admin-report.js.es6            |  5 +++--
 .../javascripts/admin/components/ip-lookup.js.es6   |  3 ++-
 .../admin/controllers/admin-customize-colors.js.es6 |  3 ++-
 .../admin/controllers/admin-emojis.js.es6           |  3 ++-
 .../controllers/admin-logs-staff-action-logs.js.es6 |  7 ++++---
 .../admin/controllers/admin-watched-words.js.es6    |  3 ++-
 app/assets/javascripts/admin/models/report.js.es6   |  3 ++-
 .../javascripts/admin/models/user-field.js.es6      |  3 ++-
 .../admin/routes/admin-backups-logs.js.es6          |  3 ++-
 .../javascripts/admin/routes/admin-backups.js.es6   |  3 ++-
 .../javascripts/admin/routes/admin-emojis.js.es6    |  3 ++-
 .../admin/routes/admin-search-logs-index.js.es6     |  3 ++-
 .../admin/routes/admin-search-logs-term.js.es6      |  3 ++-
 .../routes/admin-site-settings-category.js.es6      |  3 ++-
 .../admin/routes/admin-watched-words-action.js.es6  |  3 ++-
 .../javascripts/admin/services/admin-tools.js.es6   |  3 ++-
 app/assets/javascripts/discourse-loader.js          |  1 +
 .../javascripts/discourse/adapters/rest.js.es6      |  3 ++-
 .../discourse/components/composer-messages.js.es6   |  3 ++-
 .../components/edit-category-images.js.es6          |  5 +++--
 .../discourse/components/invite-panel.js.es6        |  5 +++--
 .../discourse/components/topic-navigation.js.es6    |  3 ++-
 .../discourse/components/user-card-contents.js.es6  |  3 ++-
 .../discourse/controllers/badges/show.js.es6        |  3 ++-
 .../discourse/controllers/edit-topic-timer.js.es6   |  3 ++-
 .../javascripts/discourse/controllers/flag.js.es6   |  3 ++-
 .../discourse/controllers/group-manage-logs.js.es6  |  5 +++--
 .../javascripts/discourse/controllers/group.js.es6  |  3 ++-
 .../javascripts/discourse/controllers/login.js.es6  |  3 ++-
 .../controllers/preferences/profile.js.es6          |  3 ++-
 .../discourse/controllers/reorder-categories.js.es6 |  3 ++-
 .../javascripts/discourse/controllers/topic.js.es6  |  3 ++-
 .../javascripts/discourse/controllers/user.js.es6   |  3 ++-
 .../discourse/initializers/banner.js.es6            |  5 +++--
 .../subscribe-user-notifications.js.es6             |  3 ++-
 .../discourse/lib/discourse-location.js.es6         |  5 +++--
 .../discourse/lib/posts-with-placeholders.js.es6    |  3 ++-
 app/assets/javascripts/discourse/lib/search.js.es6  |  5 +++--
 app/assets/javascripts/discourse/lib/url.js.es6     |  3 ++-
 .../discourse/mixins/buffered-content.js.es6        |  4 +++-
 .../javascripts/discourse/mixins/singleton.js.es6   |  4 ++--
 .../discourse/mixins/user-fields-validation.js.es6  |  3 ++-
 .../javascripts/discourse/models/badge.js.es6       |  3 ++-
 .../javascripts/discourse/models/composer.js.es6    |  5 +++--
 .../javascripts/discourse/models/group.js.es6       |  5 +++--
 .../javascripts/discourse/models/invite.js.es6      |  5 +++--
 .../discourse/models/login-method.js.es6            |  3 ++-
 .../javascripts/discourse/models/model.js.es6       |  3 ++-
 app/assets/javascripts/discourse/models/post.js.es6 |  5 +++--
 app/assets/javascripts/discourse/models/rest.js.es6 |  4 +++-
 app/assets/javascripts/discourse/models/site.js.es6 |  9 ++++-----
 .../javascripts/discourse/models/static-page.js.es6 |  3 ++-
 .../javascripts/discourse/models/store.js.es6       |  3 ++-
 .../discourse/models/topic-details.js.es6           |  3 ++-
 .../javascripts/discourse/models/topic-list.js.es6  |  3 ++-
 .../javascripts/discourse/models/topic.js.es6       |  3 ++-
 app/assets/javascripts/discourse/models/user.js.es6 |  3 ++-
 .../raw-views/list/post-count-or-badges.js.es6      |  3 ++-
 .../raw-views/list/posts-count-column.js.es6        |  3 ++-
 .../discourse/raw-views/list/visited-line.js.es6    |  3 ++-
 .../raw-views/topic-list-header-column.js.es6       |  3 ++-
 .../discourse/raw-views/topic-status.js.es6         |  3 ++-
 .../discourse/routes/discovery-categories.js.es6    |  5 +++--
 .../routes/user-private-messages-tags.js.es6        |  3 ++-
 .../discourse/services/logs-notice.js.es6           |  3 ++-
 .../javascripts/discourse/services/search.js.es6    |  3 ++-
 .../select-kit/components/select-kit.js.es6         |  5 +++--
 app/assets/javascripts/wizard/models/step.js.es6    |  3 ++-
 .../javascripts/wizard/models/wizard-field.js.es6   |  3 ++-
 app/assets/javascripts/wizard/models/wizard.js.es6  |  3 ++-
 .../admin/components/group-list-setting-test.js.es6 |  3 ++-
 .../controllers/preferences-account-test.js.es6     |  5 +++--
 .../controllers/reorder-categories-test.js.es6      | 11 ++++++-----
 test/javascripts/controllers/topic-test.js.es6      | 11 ++++++-----
 test/javascripts/helpers/component-test.js.es6      |  3 ++-
 test/javascripts/lib/computed-test.js.es6           | 13 +++++++------
 test/javascripts/mixins/singleton-test.js.es6       | 11 ++++++-----
 test/javascripts/models/composer-test.js.es6        |  3 ++-
 test/javascripts/models/model-test.js.es6           |  7 ++++---
 test/javascripts/models/topic-test.js.es6           |  3 ++-
 test/javascripts/widgets/post-test.js.es6           |  3 ++-
 81 files changed, 200 insertions(+), 120 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 28e30b8a24..4efdf09926 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -368,12 +369,12 @@ export default Component.extend({
   _buildOptions(mode) {
     if (mode === "table") {
       const tableOptions = JSON.parse(JSON.stringify(TABLE_OPTIONS));
-      return Ember.Object.create(
+      return EmberObject.create(
         Object.assign(tableOptions, this.get("reportOptions.table") || {})
       );
     } else {
       const chartOptions = JSON.parse(JSON.stringify(CHART_OPTIONS));
-      return Ember.Object.create(
+      return EmberObject.create(
         Object.assign(chartOptions, this.get("reportOptions.chart") || {})
       );
     }
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index c1938dc2d9..f97deff711 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -21,7 +22,7 @@ export default Component.extend({
 
       if (!this.location) {
         ajax("/admin/users/ip-info", { data: { ip: this.ip } }).then(location =>
-          this.set("location", Ember.Object.create(location))
+          this.set("location", EmberObject.create(location))
         );
       }
 
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 9dad0098f1..21c628be24 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -15,7 +16,7 @@ export default Controller.extend({
 
   @computed("baseColorScheme")
   baseColors(baseColorScheme) {
-    const baseColorsHash = Ember.Object.create({});
+    const baseColorsHash = EmberObject.create({});
     baseColorScheme.get("colors").forEach(color => {
       baseColorsHash.set(color.get("name"), color);
     });
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
index 6bde3d29d8..f9611b2813 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 export default Controller.extend({
@@ -12,7 +13,7 @@ export default Controller.extend({
   actions: {
     emojiUploaded(emoji) {
       emoji.url += "?t=" + new Date().getTime();
-      this.model.pushObject(Ember.Object.create(emoji));
+      this.model.pushObject(EmberObject.create(emoji));
     },
 
     destroy(emoji) {
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.es6
index e06ad2cbeb..da3afb72c5 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
@@ -20,14 +21,14 @@ export default Controller.extend({
   @on("init")
   resetFilters() {
     this.setProperties({
-      model: Ember.Object.create({ loadingMore: true }),
-      filters: Ember.Object.create()
+      model: EmberObject.create({ loadingMore: true }),
+      filters: EmberObject.create()
     });
     this.scheduleRefresh();
   },
 
   _changeFilters(props) {
-    this.set("model", Ember.Object.create({ loadingMore: true }));
+    this.set("model", EmberObject.create({ loadingMore: true }));
     this.filters.setProperties(props);
     this.scheduleRefresh();
   },
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 6d064301f3..5d52d67a36 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
@@ -28,7 +29,7 @@ export default Controller.extend({
         return wordRecord.word.indexOf(filter) > -1;
       });
       matchesByAction.pushObject(
-        Ember.Object.create({
+        EmberObject.create({
           nameKey: wordsForAction.nameKey,
           name: wordsForAction.name,
           words: wordRecords,
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index c7967cc6d5..b85e2e8c79 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { escapeExpression } from "discourse/lib/utilities";
 import { ajax } from "discourse/lib/ajax";
 import round from "discourse/lib/round";
@@ -323,7 +324,7 @@ const Report = Discourse.Model.extend({
     const formatedValue = () => {
       const userId = row[properties.id];
 
-      const user = Ember.Object.create({
+      const user = EmberObject.create({
         username,
         name: formatUsername(username),
         avatar_template: row[properties.avatar]
diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js.es6
index a57e452d86..78c004d418 100644
--- a/app/assets/javascripts/admin/models/user-field.js.es6
+++ b/app/assets/javascripts/admin/models/user-field.js.es6
@@ -1,9 +1,10 @@
+import EmberObject from "@ember/object";
 import RestModel from "discourse/models/rest";
 import { i18n } from "discourse/lib/computed";
 
 const UserField = RestModel.extend();
 
-const UserFieldType = Ember.Object.extend({
+const UserFieldType = EmberObject.extend({
   name: i18n("id", "admin.user_fields.field_types.%@")
 });
 
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index 58baa13587..3d24756a4a 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Route from "@ember/routing/route";
 import PreloadStore from "preload-store";
 
@@ -16,7 +17,7 @@ export default Route.extend({
             return log.message.length === 0 || log.message[0] === "[";
           })
           .map(function(log) {
-            return Ember.Object.create(log);
+            return EmberObject.create(log);
           })
           .value();
         logs.pushObjects(newLogs);
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index 44585e5d46..5025f41536 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
@@ -42,7 +43,7 @@ export default DiscourseRoute.extend({
       } else {
         this.controllerFor("adminBackupsLogs")
           .get("logs")
-          .pushObject(Ember.Object.create(log));
+          .pushObject(EmberObject.create(log));
       }
     });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
index 4a001195fc..dd7e94d40a 100644
--- a/app/assets/javascripts/admin/routes/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
@@ -5,7 +6,7 @@ export default DiscourseRoute.extend({
   model: function() {
     return ajax("/admin/customize/emojis.json").then(function(emojis) {
       return emojis.map(function(emoji) {
-        return Ember.Object.create(emoji);
+        return EmberObject.create(emoji);
       });
     });
   }
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.es6
index b01674d2f2..8244c0f2af 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
@@ -12,7 +13,7 @@ export default DiscourseRoute.extend({
     return ajax("/admin/logs/search_logs.json", {
       data: { period: params.period, search_type: params.searchType }
     }).then(search_logs => {
-      return search_logs.map(sl => Ember.Object.create(sl));
+      return search_logs.map(sl => EmberObject.create(sl));
     });
   },
 
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.es6
index a0cd40d8b0..7c9c8f274c 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { fillMissingDates } from "discourse/lib/utilities";
@@ -33,7 +34,7 @@ export default DiscourseRoute.extend({
         json.term.search_result = translateResults(json.term.search_result);
       }
 
-      const model = Ember.Object.create({ type: "search_log_term" });
+      const model = EmberObject.create({ type: "search_log_term" });
       model.setProperties(json.term);
       return model;
     });
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.es6
index 2b680c9b83..b5a2f810b2 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -11,7 +12,7 @@ export default DiscourseRoute.extend({
       "categoryNameKey",
       params.category_id
     );
-    return Ember.Object.create({
+    return EmberObject.create({
       nameKey: params.category_id,
       name: I18n.t("admin.site_settings.categories." + params.category_id),
       siteSettings: this.controllerFor("adminSiteSettingsCategory").get(
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.es6
index d8c76aac5c..358cfebe67 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -9,7 +10,7 @@ export default DiscourseRoute.extend({
     let filteredContent = this.controllerFor("adminWatchedWordsAction").get(
       "filteredContent"
     );
-    return Ember.Object.create({
+    return EmberObject.create({
       nameKey: params.action_id,
       name: I18n.t("admin.watched_words.actions." + params.action_id),
       words: filteredContent
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
index b8d0e6e805..38aa9e452d 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js.es6
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -2,6 +2,7 @@
 // and the admin application. Use this if you need front end code to access admin
 // modules. Inject it optionally, and if it exists go to town!
 
+import EmberObject from "@ember/object";
 import AdminUser from "admin/models/admin-user";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
@@ -22,7 +23,7 @@ export default Service.extend({
       "controller:adminLogs.staffActionLogs"
     );
     target.transitionToRoute("adminLogs.staffActionLogs").then(() => {
-      controller.set("filters", Ember.Object.create());
+      controller.set("filters", EmberObject.create());
       controller._changeFilters(filters);
     });
   },
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index f11b583d42..1762d116aa 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -12,6 +12,7 @@ var define, requirejs;
         inject: Ember.inject.controller
       },
       "@ember/object": { default: Ember.Object },
+      "@ember/object/proxy": { default: Ember.ObjectProxy },
       "@ember/routing/route": { default: Ember.Route },
       "@ember/service": {
         default: Ember.Service,
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index b5ffc0f626..3d86fe934c 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { hashString } from "discourse/lib/hash";
 
@@ -24,7 +25,7 @@ function rethrow(error) {
   throw error;
 }
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   storageKey(type, findArgs, options) {
     if (options && options.cacheKey) {
       return options.cacheKey;
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 659839bf65..fb07997b80 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import LinkLookup from "discourse/lib/link-lookup";
 
@@ -122,7 +123,7 @@ export default Component.extend({
 
   _create(info) {
     this.reset();
-    this.send("popup", Ember.Object.create(info));
+    this.send("popup", EmberObject.create(info));
   },
 
   _findSimilar() {
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
index f7b03702ec..2e12268885 100644
--- a/app/assets/javascripts/discourse/components/edit-category-images.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
@@ -33,7 +34,7 @@ export default buildCategoryPanel("images").extend({
   _deleteUpload(path) {
     this.set(
       path,
-      Ember.Object.create({
+      EmberObject.create({
         id: null,
         url: null
       })
@@ -43,7 +44,7 @@ export default buildCategoryPanel("images").extend({
   _setFromUpload(path, upload) {
     this.set(
       path,
-      Ember.Object.create({
+      EmberObject.create({
         url: upload.url,
         id: upload.id
       })
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index 3f1dd39a0a..c7f09e6bf3 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { emailValid } from "discourse/lib/utilities";
 import computed from "ember-addons/ember-computed-decorators";
@@ -324,7 +325,7 @@ export default Component.extend({
           .then(data => {
             model.setProperties({ saving: false, finished: true });
             this.get("inviteModel.details.allowed_groups").pushObject(
-              Ember.Object.create(data.group)
+              EmberObject.create(data.group)
             );
             this.appEvents.trigger("post-stream:refresh");
           })
@@ -350,7 +351,7 @@ export default Component.extend({
               });
             } else if (this.isPM && result && result.user) {
               this.get("inviteModel.details.allowed_users").pushObject(
-                Ember.Object.create(result.user)
+                EmberObject.create(result.user)
               );
               this.appEvents.trigger("post-stream:refresh");
             } else if (
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index 96db2ab095..4a67114f1a 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
@@ -14,7 +15,7 @@ export default Component.extend(PanEvents, {
 
   init() {
     this._super(...arguments);
-    this.set("info", Ember.Object.create());
+    this.set("info", EmberObject.create());
   },
 
   _performCheckSize() {
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 882e13dc45..e9ebcde33a 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -84,7 +85,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
           const value = userFields ? userFields[field.get("id")] : null;
           return Ember.isEmpty(value)
             ? null
-            : Ember.Object.create({ value, field });
+            : EmberObject.create({ value, field });
         })
         .compact();
     }
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index e34818fe0c..d1093c13bc 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,4 +1,5 @@
 import { inject } 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";
@@ -22,7 +23,7 @@ export default Controller.extend({
   @computed("filteredList")
   selectableUserBadges(filteredList) {
     return [
-      Ember.Object.create({
+      EmberObject.create({
         badge: Badge.create({ name: I18n.t("badges.none") })
       }),
       ...filteredList.uniqBy("badge.name")
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 a0562e655a..88a9109d02 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -87,7 +88,7 @@ export default Controller.extend(ModalFunctionality, {
         } else {
           const topicTimer =
             this.isPublic === "true" ? "topic_timer" : "private_topic_timer";
-          this.set(`model.${topicTimer}`, Ember.Object.create({}));
+          this.set(`model.${topicTimer}`, EmberObject.create({}));
 
           this.setProperties({
             selection: null
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index 54ef36d306..2b18533279 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import ActionSummary from "discourse/models/action-summary";
@@ -58,7 +59,7 @@ export default Controller.extend(ModalFunctionality, {
       return flagsAvailable;
     } else {
       // flagging topic
-      let lookup = Ember.Object.create();
+      let lookup = EmberObject.create();
       let model = this.model;
       model.get("actions_summary").forEach(a => {
         a.flagTopic = model;
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 123c27f4f1..f5c3ba48f3 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,4 +1,5 @@
 import { inject } from "@ember/controller";
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import {
   default as computed,
@@ -13,7 +14,7 @@ export default Controller.extend({
 
   init() {
     this._super(...arguments);
-    this.set("filters", Ember.Object.create());
+    this.set("filters", EmberObject.create());
   },
 
   @computed(
@@ -53,7 +54,7 @@ export default Controller.extend({
   reset() {
     this.setProperties({
       offset: 0,
-      filters: Ember.Object.create()
+      filters: EmberObject.create()
     });
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index ee4011d939..322e7ab12c 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,8 +1,9 @@
+import EmberObject from "@ember/object";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-const Tab = Ember.Object.extend({
+const Tab = EmberObject.extend({
   init() {
     this._super(...arguments);
     let name = this.name;
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index cec011b279..ca94d979c0 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -378,7 +379,7 @@ export default Controller.extend(ModalFunctionality, {
       accountEmail: options.email,
       accountUsername: options.username,
       accountName: options.name,
-      authOptions: Ember.Object.create(options)
+      authOptions: EmberObject.create(options)
     });
 
     showModal("createAccount");
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index f253c027f4..315c8c9da5 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
@@ -34,7 +35,7 @@ export default Controller.extend(PreferencesTabController, {
         const value = userFields
           ? userFields[field.get("id").toString()]
           : null;
-        return Ember.Object.create({ value, field });
+        return EmberObject.create({ value, field });
       });
     }
   },
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index 05d69d39c6..c7dda8c792 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -1,3 +1,4 @@
+import EmberObjectProxy from "@ember/object/proxy";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -23,7 +24,7 @@ export default Controller.extend(ModalFunctionality, Ember.Evented, {
 
   @computed("site.categories")
   categoriesBuffered(categories) {
-    const bufProxy = Ember.ObjectProxy.extend(BufferedProxy);
+    const bufProxy = EmberObjectProxy.extend(BufferedProxy);
     return categories.map(c => bufProxy.create({ content: c }));
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index ba9afb0a96..d31fe00292 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -1058,7 +1059,7 @@ export default Controller.extend(bufferedProperty("model"), {
         statusType,
         null
       )
-        .then(() => this.set(`model.${topicTimer}`, Ember.Object.create({})))
+        .then(() => this.set(`model.${topicTimer}`, EmberObject.create({})))
         .catch(error => popupAjaxError(error));
     }
   },
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index ebe7a8bb23..81ce8051bd 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -124,7 +125,7 @@ export default Controller.extend(CanCheckEmails, {
             : null;
           return Ember.isEmpty(value)
             ? null
-            : Ember.Object.create({ value, field });
+            : EmberObject.create({ value, field });
         })
         .compact();
     }
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6
index 46e3899b30..ccec6a95b4 100644
--- a/app/assets/javascripts/discourse/initializers/banner.js.es6
+++ b/app/assets/javascripts/discourse/initializers/banner.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import PreloadStore from "preload-store";
 
 export default {
@@ -5,7 +6,7 @@ export default {
   after: "message-bus",
 
   initialize(container) {
-    const banner = Ember.Object.create(PreloadStore.get("banner") || {}),
+    const banner = EmberObject.create(PreloadStore.get("banner") || {}),
       site = container.lookup("site:main");
 
     site.set("banner", banner);
@@ -16,7 +17,7 @@ export default {
     }
 
     messageBus.subscribe("/site/banner", function(ban) {
-      site.set("banner", Ember.Object.create(ban || {}));
+      site.set("banner", EmberObject.create(ban || {}));
     });
   }
 };
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 d3c251bb88..2de97db037 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 // Subscribes to user events on the message bus
 import {
   init as initDesktopNotifications,
@@ -82,7 +83,7 @@ export default {
               }
               oldNotifications.insertAt(
                 insertPosition,
-                Ember.Object.create(lastNotification)
+                EmberObject.create(lastNotification)
               );
             }
 
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
index 3843831588..b1238d8d39 100644
--- a/app/assets/javascripts/discourse/lib/discourse-location.js.es6
+++ b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { defaultHomepage } from "discourse/lib/utilities";
 let popstateFired = false;
 const supportsHistoryState = window.history && "state" in window.history;
@@ -9,9 +10,9 @@ const popstateCallbacks = [];
 
   @class DiscourseLocation
   @namespace Discourse
-  @extends Ember.Object
+  @extends @ember/object
 */
-const DiscourseLocation = Ember.Object.extend({
+const DiscourseLocation = EmberObject.extend({
   init() {
     this._super(...arguments);
 
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 03271c6d6b..d1b2092445 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -1,10 +1,11 @@
+import EmberObject from "@ember/object";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export function Placeholder(viewName) {
   this.viewName = viewName;
 }
 
-export default Ember.Object.extend(Ember.Array, {
+export default EmberObject.extend(Ember.Array, {
   posts: null,
   _appendingIds: null,
 
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index b8e7dd0546..a558fdd495 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 import Category from "discourse/models/category";
@@ -75,7 +76,7 @@ export function translateResults(results, opts) {
   results.tags = results.tags
     .map(function(tag) {
       const tagName = Handlebars.Utils.escapeExpression(tag.name);
-      return Ember.Object.create({
+      return EmberObject.create({
         id: tagName,
         url: Discourse.getURL("/tags/" + tagName)
       });
@@ -127,7 +128,7 @@ export function translateResults(results, opts) {
     !results.categories.length
   );
 
-  return noResults ? null : Ember.Object.create(results);
+  return noResults ? null : EmberObject.create(results);
 }
 
 export function searchForTerm(term, opts) {
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 34bb600e07..085619f9e9 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
@@ -77,7 +78,7 @@ export function jumpToElement(elementId) {
 
 let _transitioning = false;
 
-const DiscourseURL = Ember.Object.extend({
+const DiscourseURL = EmberObject.extend({
   isJumpScheduled() {
     return _transitioning || _jumpScheduled;
   },
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
index 36f6de6071..99364df7a9 100644
--- a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
+++ b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
@@ -1,8 +1,10 @@
+import EmberObjectProxy from "@ember/object/proxy";
+
 /* global BufferedProxy: true */
 export function bufferedProperty(property) {
   const mixin = {
     buffered: Ember.computed(property, function() {
-      return Ember.ObjectProxy.extend(BufferedProxy).create({
+      return EmberObjectProxy.extend(BufferedProxy).create({
         content: this.get(property)
       });
     }),
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js.es6
index 62a8265613..b67c529fdf 100644
--- a/app/assets/javascripts/discourse/mixins/singleton.js.es6
+++ b/app/assets/javascripts/discourse/mixins/singleton.js.es6
@@ -8,7 +8,7 @@
   ```javascript
 
     // Define your class and apply the Mixin
-    User = Ember.Object.extend({});
+    User = EmberObject.extend({});
     User.reopenClass(Singleton);
 
     // Retrieve the current instance:
@@ -34,7 +34,7 @@
   ```javascript
 
     // Define your class and apply the Mixin
-    Foot = Ember.Object.extend({});
+    Foot = EmberObject.extend({});
     Foot.reopenClass(Singleton, {
       createCurrent: function() {
         return Foot.create({toes: 5});
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
index 57a4b9cec0..c5345d4ee9 100644
--- a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import InputValidation from "discourse/models/input-validation";
 import {
   on,
@@ -14,7 +15,7 @@ export default Ember.Mixin.create({
     let userFields = this.site.get("user_fields");
     if (userFields) {
       userFields = _.sortBy(userFields, "position").map(function(f) {
-        return Ember.Object.create({ value: null, field: f });
+        return EmberObject.create({ value: null, field: f });
       });
     }
     this.set("userFields", userFields);
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index d70a5fbbe6..ed1378ac3b 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import BadgeGrouping from "discourse/models/badge-grouping";
 import RestModel from "discourse/models/rest";
@@ -66,7 +67,7 @@ Badge.reopenClass({
     if ("badge_types" in json) {
       json.badge_types.forEach(
         badgeTypeJson =>
-          (badgeTypes[badgeTypeJson.id] = Ember.Object.create(badgeTypeJson))
+          (badgeTypes[badgeTypeJson.id] = EmberObject.create(badgeTypeJson))
       );
     }
 
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 686d98c5fb..4d851e6e3a 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
@@ -215,7 +216,7 @@ const Composer = RestModel.extend({
 
   @observes("archetype")
   archetypeChanged() {
-    return this.set("metaData", Ember.Object.create());
+    return this.set("metaData", EmberObject.create());
   },
 
   // view detected user is typing
@@ -677,7 +678,7 @@ const Composer = RestModel.extend({
 
     this.setProperties({
       archetypeId: opts.archetypeId || this.site.default_archetype,
-      metaData: opts.metaData ? Ember.Object.create(opts.metaData) : null,
+      metaData: opts.metaData ? EmberObject.create(opts.metaData) : null,
       reply: opts.reply || this.reply || ""
     });
 
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 05bece07f8..27adb809f7 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -9,6 +9,7 @@ import Category from "discourse/models/category";
 import User from "discourse/models/user";
 import Topic from "discourse/models/topic";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import EmberObject from "@ember/object";
 
 const Group = RestModel.extend({
   limit: 50,
@@ -216,7 +217,7 @@ const Group = RestModel.extend({
     return ajax(`/groups/${this.name}/logs.json`, {
       data: { offset, filters }
     }).then(results => {
-      return Ember.Object.create({
+      return EmberObject.create({
         logs: results["logs"].map(log => GroupHistory.create(log)),
         all_loaded: results["all_loaded"]
       });
@@ -241,7 +242,7 @@ const Group = RestModel.extend({
         p.user = User.create(p.user);
         p.topic = Topic.create(p.topic);
         p.category = Category.findById(p.category_id);
-        return Ember.Object.create(p);
+        return EmberObject.create(p);
       });
     });
   },
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index 842a04a324..f8a4a03610 100644
--- a/app/assets/javascripts/discourse/models/invite.js.es6
+++ b/app/assets/javascripts/discourse/models/invite.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { userPath } from "discourse/lib/url";
@@ -42,7 +43,7 @@ Invite.reopenClass({
       data
     }).then(result => {
       result.invites = result.invites.map(i => Invite.create(i));
-      return Ember.Object.create(result);
+      return EmberObject.create(result);
     });
   },
 
@@ -50,7 +51,7 @@ Invite.reopenClass({
     if (!user) Ember.RSVP.resolve();
 
     return ajax(userPath(`${user.username_lower}/invited_count.json`)).then(
-      result => Ember.Object.create(result.counts)
+      result => EmberObject.create(result.counts)
     );
   },
 
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js.es6
index ce59db2450..6e7de67e55 100644
--- a/app/assets/javascripts/discourse/models/login-method.js.es6
+++ b/app/assets/javascripts/discourse/models/login-method.js.es6
@@ -1,7 +1,8 @@
+import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 import { updateCsrfToken } from "discourse/lib/ajax";
 
-const LoginMethod = Ember.Object.extend({
+const LoginMethod = EmberObject.extend({
   @computed
   title() {
     return this.title_override || I18n.t(`login.${this.name}.title`);
diff --git a/app/assets/javascripts/discourse/models/model.js.es6 b/app/assets/javascripts/discourse/models/model.js.es6
index c6a0b3ec20..ea1c950688 100644
--- a/app/assets/javascripts/discourse/models/model.js.es6
+++ b/app/assets/javascripts/discourse/models/model.js.es6
@@ -1,4 +1,5 @@
-const Model = Ember.Object.extend();
+import EmberObject from "@ember/object";
+const Model = EmberObject.extend();
 
 Model.reopenClass({
   extractByKey(collection, klass) {
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index a82cef491d..3e72627a10 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -346,7 +347,7 @@ const Post = RestModel.extend({
 Post.reopenClass({
   munge(json) {
     if (json.actions_summary) {
-      const lookup = Ember.Object.create();
+      const lookup = EmberObject.create();
 
       // this area should be optimized, it is creating way too many objects per post
       json.actions_summary = json.actions_summary.map(a => {
@@ -394,7 +395,7 @@ Post.reopenClass({
 
   loadRevision(postId, version) {
     return ajax(`/posts/${postId}/revisions/${version}.json`).then(result =>
-      Ember.Object.create(result)
+      EmberObject.create(result)
     );
   },
 
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index 8b731f584f..d9199082fd 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -1,4 +1,6 @@
-const RestModel = Ember.Object.extend({
+import EmberObject from "@ember/object";
+
+const RestModel = EmberObject.extend({
   isNew: Ember.computed.equal("__state", "new"),
   isCreated: Ember.computed.equal("__state", "created"),
   isSaving: false,
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 1089956d6c..2c09a478d0 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 import Archetype from "discourse/models/archetype";
 import PostActionType from "discourse/models/post-action-type";
@@ -179,7 +180,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.post_action_types) {
-      result.postActionByIdLookup = Ember.Object.create();
+      result.postActionByIdLookup = EmberObject.create();
       result.post_action_types = result.post_action_types.map(p => {
         const actionType = PostActionType.create(p);
         result.postActionByIdLookup.set("action" + p.id, actionType);
@@ -188,7 +189,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.topic_flag_types) {
-      result.topicFlagByIdLookup = Ember.Object.create();
+      result.topicFlagByIdLookup = EmberObject.create();
       result.topic_flag_types = result.topic_flag_types.map(p => {
         const actionType = PostActionType.create(p);
         result.topicFlagByIdLookup.set("action" + p.id, actionType);
@@ -204,9 +205,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.user_fields) {
-      result.user_fields = result.user_fields.map(uf =>
-        Ember.Object.create(uf)
-      );
+      result.user_fields = result.user_fields.map(uf => EmberObject.create(uf));
     }
 
     return result;
diff --git a/app/assets/javascripts/discourse/models/static-page.js.es6 b/app/assets/javascripts/discourse/models/static-page.js.es6
index a8cdb2507b..50c63e083c 100644
--- a/app/assets/javascripts/discourse/models/static-page.js.es6
+++ b/app/assets/javascripts/discourse/models/static-page.js.es6
@@ -1,5 +1,6 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
-const StaticPage = Ember.Object.extend();
+const StaticPage = EmberObject.extend();
 
 StaticPage.reopenClass({
   find(path) {
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 96a96f502f..a5caad53a1 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import ResultSet from "discourse/models/result-set";
@@ -44,7 +45,7 @@ function findAndRemoveMap(type, id) {
 
 flushMap();
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   _plurals: {
     "post-reply": "post-replies",
     "post-reply-history": "post_reply_histories",
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6
index 9f486f0712..0622cacb69 100644
--- a/app/assets/javascripts/discourse/models/topic-details.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-details.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -23,7 +24,7 @@ const TopicDetails = RestModel.extend({
     if (details.participants) {
       details.participants = details.participants.map(function(p) {
         p.topic = topic;
-        return Ember.Object.create(p);
+        return EmberObject.create(p);
       });
     }
 
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index e12a90e77e..25834624b3 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import Model from "discourse/models/model";
@@ -135,7 +136,7 @@ TopicList.reopenClass({
 
     const categories = Discourse.Category.list(),
       users = Model.extractByKey(result.users, Discourse.User),
-      groups = Model.extractByKey(result.primary_groups, Ember.Object);
+      groups = Model.extractByKey(result.primary_groups, EmberObject);
 
     return result.topic_list[listKey].map(t => {
       t.category = categories.findBy("id", t.category_id);
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 03345d7744..de72adeed8 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { flushMap } from "discourse/models/store";
 import RestModel from "discourse/models/rest";
@@ -635,7 +636,7 @@ Topic.reopenClass({
 
   createActionSummary(result) {
     if (result.actions_summary) {
-      const lookup = Ember.Object.create();
+      const lookup = EmberObject.create();
       result.actions_summary = result.actions_summary.map(a => {
         a.post = result;
         a.actionType = Discourse.Site.current().postActionTypeById(a.id);
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 1665a825ff..57c8a070b1 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
@@ -116,7 +117,7 @@ const User = RestModel.extend({
     const keys = this.user_api_keys;
     if (keys) {
       return keys.map(raw => {
-        let obj = Ember.Object.create(raw);
+        let obj = EmberObject.create(raw);
 
         obj.revoke = () => {
           this.revokeApiKey(obj);
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.es6
index 2f3dc5beb9..42356a4854 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import EmberObject from "@ember/object";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   postCountsPresent: Ember.computed.or("topic.unread", "topic.displayNewPosts"),
   showBadges: Ember.computed.and("postBadgesEnabled", "postCountsPresent"),
 
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.es6
index 2171251840..2c7ca4c9b9 100644
--- 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.es6
@@ -1,7 +1,8 @@
+import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   tagName: "td",
 
   @computed("topic.like_count", "topic.posts_count")
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.es6
index 3626b17cb7..b2aac57550 100644
--- a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
@@ -1,6 +1,7 @@
+import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   @computed
   isLastVisited: function() {
     return this.lastVisitedTopic === this.topic;
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.es6
index 5febdd4fef..0ac85216b7 100644
--- 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.es6
@@ -1,6 +1,7 @@
+import EmberObject from "@ember/object";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   @computed
   localizedName() {
     if (this.forceName) {
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
index ec33498520..8e7269bbca 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
@@ -1,6 +1,7 @@
+import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   showDefault: null,
 
   @computed("defaultIcon")
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index a6eb60b293..19543ae481 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
@@ -51,7 +52,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
         wrappedCategoriesList && wrappedCategoriesList.category_list;
 
       if (categoriesList && topicsList) {
-        return Ember.Object.create({
+        return EmberObject.create({
           categories: CategoryList.categoriesFrom(
             this.store,
             wrappedCategoriesList
@@ -66,7 +67,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
       }
       // Otherwise, return the ajax result
       return ajax(`/categories_and_${filter}`).then(result => {
-        return Ember.Object.create({
+        return EmberObject.create({
           categories: CategoryList.categoriesFrom(this.store, result),
           topics: TopicList.topicsFrom(this.store, result),
           can_create_category: result.category_list.can_create_category,
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.es6
index baf5ae81d1..cfe2d026bb 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ export default DiscourseRoute.extend({
     const username = this.modelFor("user").get("username_lower");
     return ajax(`/tags/personal_messages/${username}`)
       .then(result => {
-        return result.tags.map(tag => Ember.Object.create(tag));
+        return result.tags.map(tag => EmberObject.create(tag));
       })
       .catch(popupAjaxError);
   },
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js.es6
index f70e021992..3395489ce4 100644
--- a/app/assets/javascripts/discourse/services/logs-notice.js.es6
+++ b/app/assets/javascripts/discourse/services/logs-notice.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import {
   default as computed,
   on,
@@ -7,7 +8,7 @@ import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
 
 const LOGS_NOTICE_KEY = "logs-notice-text";
 
-const LogsNotice = Ember.Object.extend({
+const LogsNotice = EmberObject.extend({
   text: "",
 
   @on("init")
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js.es6
index 2a47789da4..dba599c690 100644
--- a/app/assets/javascripts/discourse/services/search.js.es6
+++ b/app/assets/javascripts/discourse/services/search.js.es6
@@ -1,9 +1,10 @@
+import EmberObject from "@ember/object";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Object.extend({
+export default EmberObject.extend({
   searchContextEnabled: false, // checkbox to scope search
   searchContext: null,
   term: null,
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 51e16b0bd2..9179e66680 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Component from "@ember/component";
 const { get, isNone, run, isEmpty, makeArray } = Ember;
 import computed from "ember-addons/ember-computed-decorators";
@@ -87,11 +88,11 @@ export default Component.extend(
       this.noneValue = "__none__";
       this.set(
         "headerComponentOptions",
-        Ember.Object.create({ forceEscape: this.forceEscape })
+        EmberObject.create({ forceEscape: this.forceEscape })
       );
       this.set(
         "rowComponentOptions",
-        Ember.Object.create({
+        EmberObject.create({
           forceEscape: this.forceEscape
         })
       );
diff --git a/app/assets/javascripts/wizard/models/step.js.es6 b/app/assets/javascripts/wizard/models/step.js.es6
index c8c5fd1d62..cbc7edca18 100644
--- a/app/assets/javascripts/wizard/models/step.js.es6
+++ b/app/assets/javascripts/wizard/models/step.js.es6
@@ -1,8 +1,9 @@
+import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 import ValidState from "wizard/mixins/valid-state";
 import { ajax } from "wizard/lib/ajax";
 
-export default Ember.Object.extend(ValidState, {
+export default EmberObject.extend(ValidState, {
   id: null,
 
   @computed("index")
diff --git a/app/assets/javascripts/wizard/models/wizard-field.js.es6 b/app/assets/javascripts/wizard/models/wizard-field.js.es6
index 5ad88e2634..91668cbd66 100644
--- a/app/assets/javascripts/wizard/models/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/models/wizard-field.js.es6
@@ -1,6 +1,7 @@
+import EmberObject from "@ember/object";
 import ValidState from "wizard/mixins/valid-state";
 
-export default Ember.Object.extend(ValidState, {
+export default EmberObject.extend(ValidState, {
   id: null,
   type: null,
   value: null,
diff --git a/app/assets/javascripts/wizard/models/wizard.js.es6 b/app/assets/javascripts/wizard/models/wizard.js.es6
index a4e65c6de1..569a2d5bf7 100644
--- a/app/assets/javascripts/wizard/models/wizard.js.es6
+++ b/app/assets/javascripts/wizard/models/wizard.js.es6
@@ -2,8 +2,9 @@ import Step from "wizard/models/step";
 import WizardField from "wizard/models/wizard-field";
 import { ajax } from "wizard/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
+import EmberObject from "@ember/object";
 
-const Wizard = Ember.Object.extend({
+const Wizard = EmberObject.extend({
   @computed("steps.length")
   totalSteps: length => length,
 
diff --git a/test/javascripts/admin/components/group-list-setting-test.js.es6 b/test/javascripts/admin/components/group-list-setting-test.js.es6
index f998ccbd0b..6873262bb2 100644
--- a/test/javascripts/admin/components/group-list-setting-test.js.es6
+++ b/test/javascripts/admin/components/group-list-setting-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 
@@ -20,7 +21,7 @@ componentTest("default", {
 
     this.set(
       "setting",
-      Ember.Object.create({
+      EmberObject.create({
         allowsNone: undefined,
         category: "foo",
         default: "",
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js.es6
index 2d40ac26f3..a0a8ae3840 100644
--- a/test/javascripts/controllers/preferences-account-test.js.es6
+++ b/test/javascripts/controllers/preferences-account-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 moduleFor("controller:preferences/account");
 
 QUnit.test("updating of associated accounts", function(assert) {
@@ -5,11 +6,11 @@ QUnit.test("updating of associated accounts", function(assert) {
     siteSettings: {
       enable_google_oauth2_logins: true
     },
-    model: Ember.Object.create({
+    model: EmberObject.create({
       second_factor_enabled: true,
       is_anonymous: true
     }),
-    site: Ember.Object.create({
+    site: EmberObject.create({
       isMobileDevice: false
     })
   });
diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js.es6
index 1b653682f4..26e28180f1 100644
--- a/test/javascripts/controllers/reorder-categories-test.js.es6
+++ b/test/javascripts/controllers/reorder-categories-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { mapRoutes } from "discourse/mapping-router";
 import createStore from "helpers/create-store";
 
@@ -16,7 +17,7 @@ QUnit.test("fixIndices set unique position number", function(assert) {
     categories.push(store.createRecord("category", { id: i, position: 0 }));
   }
 
-  const site = Ember.Object.create({ categories: categories });
+  const site = EmberObject.create({ categories: categories });
   const reorderCategoriesController = this.subject({ site });
 
   reorderCategoriesController.fixIndices();
@@ -59,7 +60,7 @@ QUnit.test(
     const categories = [child2, parent, other, child1];
     const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
 
-    const site = Ember.Object.create({ categories: categories });
+    const site = EmberObject.create({ categories: categories });
     const reorderCategoriesController = this.subject({ site });
 
     reorderCategoriesController.fixIndices();
@@ -95,7 +96,7 @@ QUnit.test(
     });
 
     const categories = [elem1, elem2, elem3];
-    const site = Ember.Object.create({ categories: categories });
+    const site = EmberObject.create({ categories: categories });
     const reorderCategoriesController = this.subject({ site });
 
     reorderCategoriesController.actions.change.call(
@@ -142,7 +143,7 @@ QUnit.test(
     });
 
     const categories = [elem1, child1, elem2, elem3];
-    const site = Ember.Object.create({ categories: categories });
+    const site = EmberObject.create({ categories: categories });
     const reorderCategoriesController = this.subject({ site });
 
     reorderCategoriesController.actions.change.call(
@@ -189,7 +190,7 @@ QUnit.test(
     });
 
     const categories = [elem1, child1, elem2, elem3];
-    const site = Ember.Object.create({ categories: categories });
+    const site = EmberObject.create({ categories: categories });
     const reorderCategoriesController = this.subject({ site });
 
     reorderCategoriesController.fixIndices();
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index 262b300859..f12da98666 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Topic from "discourse/models/topic";
 import PostStream from "discourse/models/post-stream";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -191,7 +192,7 @@ QUnit.test("selectedPostsUsername", function(assert) {
 });
 
 QUnit.test("showSelectedPostsAtBottom", function(assert) {
-  const site = Ember.Object.create({ mobileView: false });
+  const site = EmberObject.create({ mobileView: false });
   const model = Topic.create({ posts_count: 3 });
   const controller = this.subject({ model, site });
 
@@ -467,7 +468,7 @@ QUnit.test("togglePostSelection", function(assert) {
 // });
 
 QUnit.test("selectBelow", function(assert) {
-  const site = Ember.Object.create({
+  const site = EmberObject.create({
     post_types: { small_action: 3, whisper: 4 }
   });
 
@@ -521,7 +522,7 @@ QUnit.test(
     });
 
     let destroyed;
-    const post = Ember.Object.create({
+    const post = EmberObject.create({
       id: 2,
       post_number: 2,
       can_delete: true,
@@ -532,12 +533,12 @@ QUnit.test(
       }
     });
 
-    const postStream = Ember.Object.create({
+    const postStream = EmberObject.create({
       stream: [2, 3, 4],
       posts: [post, { id: 3 }, { id: 4 }]
     });
 
-    const currentUser = Ember.Object.create({ moderator: true });
+    const currentUser = EmberObject.create({ moderator: true });
     const model = Topic.create({ postStream });
     const controller = this.subject({ model, currentUser });
 
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index e694cb8a05..5a571d45cd 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import createStore from "helpers/create-store";
 import { autoLoadModules } from "discourse/initializers/auto-load-modules";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
@@ -15,7 +16,7 @@ export default function(name, opts) {
     this.registry.register("site-settings:main", Discourse.SiteSettings, {
       instantiate: false
     });
-    this.registry.register("capabilities:main", Ember.Object);
+    this.registry.register("capabilities:main", EmberObject);
     this.registry.register("site:main", this.site, { instantiate: false });
     this.registry.injection("component", "siteSettings", "site-settings:main");
     this.registry.injection("component", "appEvents", "service:app-events");
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 6b3b881119..0a94485f44 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import {
   setting,
   propertyEqual,
@@ -20,7 +21,7 @@ QUnit.module("lib:computed", {
 });
 
 QUnit.test("setting", assert => {
-  var t = Ember.Object.extend({
+  var t = EmberObject.extend({
     vehicle: setting("vehicle"),
     missingProp: setting("madeUpThing")
   }).create();
@@ -38,7 +39,7 @@ QUnit.test("setting", assert => {
 });
 
 QUnit.test("propertyEqual", assert => {
-  var t = Ember.Object.extend({
+  var t = EmberObject.extend({
     same: propertyEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
@@ -51,7 +52,7 @@ QUnit.test("propertyEqual", assert => {
 });
 
 QUnit.test("propertyNotEqual", assert => {
-  var t = Ember.Object.extend({
+  var t = EmberObject.extend({
     diff: propertyNotEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
@@ -64,7 +65,7 @@ QUnit.test("propertyNotEqual", assert => {
 });
 
 QUnit.test("fmt", assert => {
-  var t = Ember.Object.extend({
+  var t = EmberObject.extend({
     exclaimyUsername: fmt("username", "!!! %@ !!!"),
     multiple: fmt("username", "mood", "%@ is %@")
   }).create({
@@ -98,7 +99,7 @@ QUnit.test("fmt", assert => {
 });
 
 QUnit.test("i18n", assert => {
-  var t = Ember.Object.extend({
+  var t = EmberObject.extend({
     exclaimyUsername: i18n("username", "!!! %@ !!!"),
     multiple: i18n("username", "mood", "%@ is %@")
   }).create({
@@ -134,7 +135,7 @@ QUnit.test("i18n", assert => {
 QUnit.test("url", assert => {
   var t, testClass;
 
-  testClass = Ember.Object.extend({
+  testClass = EmberObject.extend({
     userUrl: url("username", "/u/%@")
   });
 
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js.es6
index 0ed6c198ee..23921ad3d3 100644
--- a/test/javascripts/mixins/singleton-test.js.es6
+++ b/test/javascripts/mixins/singleton-test.js.es6
@@ -1,9 +1,10 @@
+import EmberObject from "@ember/object";
 import Singleton from "discourse/mixins/singleton";
 
 QUnit.module("mixin:singleton");
 
 QUnit.test("current", assert => {
-  var DummyModel = Ember.Object.extend({});
+  var DummyModel = EmberObject.extend({});
   DummyModel.reopenClass(Singleton);
 
   var current = DummyModel.current();
@@ -21,7 +22,7 @@ QUnit.test("current", assert => {
 });
 
 QUnit.test("currentProp reading", assert => {
-  var DummyModel = Ember.Object.extend({});
+  var DummyModel = EmberObject.extend({});
   DummyModel.reopenClass(Singleton);
   var current = DummyModel.current();
 
@@ -38,7 +39,7 @@ QUnit.test("currentProp reading", assert => {
 });
 
 QUnit.test("currentProp writing", assert => {
-  var DummyModel = Ember.Object.extend({});
+  var DummyModel = EmberObject.extend({});
   DummyModel.reopenClass(Singleton);
 
   assert.blank(
@@ -65,7 +66,7 @@ QUnit.test("currentProp writing", assert => {
 });
 
 QUnit.test("createCurrent", assert => {
-  var Shoe = Ember.Object.extend({});
+  var Shoe = EmberObject.extend({});
   Shoe.reopenClass(Singleton, {
     createCurrent: function() {
       return Shoe.create({ toes: 5 });
@@ -80,7 +81,7 @@ QUnit.test("createCurrent", assert => {
 });
 
 QUnit.test("createCurrent that returns null", assert => {
-  var Missing = Ember.Object.extend({});
+  var Missing = EmberObject.extend({});
   Missing.reopenClass(Singleton, {
     createCurrent: function() {
       return null;
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6
index 34fb578044..78c823b2be 100644
--- a/test/javascripts/models/composer-test.js.es6
+++ b/test/javascripts/models/composer-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { currentUser } from "helpers/qunit-helpers";
 import AppEvents from "discourse/services/app-events";
 import Composer from "discourse/models/composer";
@@ -236,7 +237,7 @@ QUnit.test("Title length for private messages", assert => {
 
 QUnit.test("Post length for private messages with non human users", assert => {
   const composer = createComposer({
-    topic: Ember.Object.create({ pm_with_non_human_user: true })
+    topic: EmberObject.create({ pm_with_non_human_user: true })
   });
 
   assert.equal(composer.get("minimumPostLength"), 1);
diff --git a/test/javascripts/models/model-test.js.es6 b/test/javascripts/models/model-test.js.es6
index f5e81acae7..f38063d6af 100644
--- a/test/javascripts/models/model-test.js.es6
+++ b/test/javascripts/models/model-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import Model from "discourse/models/model";
 
 QUnit.module("model:discourse");
@@ -8,10 +9,10 @@ QUnit.test(
     var firstObject = { id: "id_1", foo: "foo_1" };
     var secondObject = { id: "id_2", foo: "foo_2" };
 
-    var actual = Model.extractByKey([firstObject, secondObject], Ember.Object);
+    var actual = Model.extractByKey([firstObject, secondObject], EmberObject);
     var expected = {
-      id_1: Ember.Object.create(firstObject),
-      id_2: Ember.Object.create(secondObject)
+      id_1: EmberObject.create(firstObject),
+      id_2: EmberObject.create(secondObject)
     };
 
     assert.ok(_.isEqual(actual, expected));
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6
index e385e1e92f..1deab13a54 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 QUnit.module("model:topic");
@@ -33,7 +34,7 @@ QUnit.test("visited", assert => {
 });
 
 QUnit.test("lastUnreadUrl", assert => {
-  const category = Ember.Object.create({
+  const category = EmberObject.create({
     navigate_to_first_post_after_read: true
   });
 
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 422e485a5d..23a7b17bdf 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
 moduleForWidget("post");
@@ -861,7 +862,7 @@ widgetTest("pm map", {
       showTopicMap: true,
       showPMMap: true,
       allowedGroups: [],
-      allowedUsers: [Ember.Object.create({ username: "eviltrout" })]
+      allowedUsers: [EmberObject.create({ username: "eviltrout" })]
     });
   },
   test(assert) {

From 5ca60fcb6b592524086f98279d3e4fd949598343 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 14:52:36 -0400
Subject: [PATCH 221/328] REFACTOR: Use imports for `Ember.run`

---
 .../components/admin-backups-logs.js.es6      |  3 +-
 .../components/admin-report-chart.js.es6      |  8 +++--
 .../admin-report-stacked-chart.js.es6         |  8 +++--
 .../admin/components/admin-report.js.es6      |  3 +-
 .../components/admin-theme-editor.js.es6      |  3 +-
 .../components/admin-user-field-item.js.es6   |  3 +-
 .../admin/components/color-input.js.es6       |  5 +--
 .../admin/components/embeddable-host.js.es6   |  3 +-
 .../admin/components/ip-lookup.js.es6         |  3 +-
 .../components/penalty-post-action.js.es6     |  3 +-
 .../admin/components/permalink-form.js.es6    |  5 +--
 .../admin/components/resumable-upload.js.es6  | 14 ++++----
 .../screened-ip-address-form.js.es6           |  5 +--
 .../admin/components/themes-list-item.js.es6  |  3 +-
 .../admin/components/watched-word-form.js.es6 |  5 +--
 .../admin-customize-colors-show.js.es6        |  3 +-
 .../admin-dashboard-reports.js.es6            |  3 +-
 .../admin-logs-staff-action-logs.js.es6       |  3 +-
 .../controllers/admin-site-text-index.js.es6  |  5 +--
 .../controllers/admin-user-badges.js.es6      |  3 +-
 .../admin-watched-words-action.js.es6         |  3 +-
 .../lib/buffered-render.js.es6                |  3 +-
 .../mixins/focus-event.js.es6                 |  3 +-
 app/assets/javascripts/discourse-loader.js    | 12 +++++++
 .../add-category-tag-classes.js.es6           |  3 +-
 .../components/choose-message.js.es6          |  3 +-
 .../discourse/components/choose-topic.js.es6  |  3 +-
 .../discourse/components/composer-body.js.es6 | 15 ++++++---
 .../components/composer-editor.js.es6         | 33 +++++++++++--------
 .../components/composer-messages.js.es6       |  3 +-
 .../components/composer-title.js.es6          | 13 +++++---
 .../components/composer-user-selector.js.es6  |  3 +-
 .../discourse/components/cook-text.js.es6     |  3 +-
 .../discourse/components/d-editor.js.es6      | 23 ++++++++-----
 .../discourse/components/d-modal-body.js.es6  |  3 +-
 .../discourse/components/d-modal.js.es6       |  5 +--
 .../discourse/components/date-input.js.es6    |  3 +-
 .../discourse/components/date-picker.js.es6   |  3 +-
 .../components/discourse-topic.js.es6         | 12 ++++---
 .../components/discovery-topics-list.js.es6   |  8 +++--
 .../components/edit-category-tab.js.es6       |  3 +-
 .../edit-category-topic-template.js.es6       |  3 +-
 .../components/edit-topic-timer-form.js.es6   |  3 +-
 .../components/expanding-text-area.js.es6     |  3 +-
 .../components/flag-selection.js.es6          |  3 +-
 .../discourse/components/footer-nav.js.es6    |  3 +-
 .../discourse/components/global-notice.js.es6 |  5 +--
 .../components/group-flair-inputs.js.es6      |  3 +-
 .../components/image-uploader.js.es6          |  5 +--
 .../discourse/components/link-to-input.js.es6 |  3 +-
 .../discourse/components/login-modal.js.es6   |  3 +-
 .../discourse/components/mobile-nav.js.es6    |  5 +--
 .../discourse/components/mount-widget.js.es6  | 10 +++---
 .../components/navigation-bar.js.es6          |  5 +--
 .../components/pwa-install-banner.js.es6      |  3 +-
 .../discourse/components/quote-button.js.es6  |  3 +-
 .../components/scroll-tracker.js.es6          |  3 +-
 .../components/scrolling-post-stream.js.es6   | 11 ++++---
 .../components/search-advanced-options.js.es6 |  6 ++--
 .../discourse/components/share-panel.js.es6   |  3 +-
 .../discourse/components/share-popup.js.es6   | 10 +++---
 .../discourse/components/signup-cta.js.es6    |  3 +-
 .../discourse/components/site-header.js.es6   |  9 +++--
 .../discourse/components/text-overflow.js.es6 |  3 +-
 .../discourse/components/time-input.js.es6    |  3 +-
 .../components/topic-entrance.js.es6          |  3 +-
 .../discourse/components/topic-list.js.es6    |  3 +-
 .../components/topic-navigation.js.es6        | 10 +++---
 .../components/topic-progress.js.es6          |  9 ++---
 .../components/topic-timeline.js.es6          |  3 +-
 .../components/topic-timer-info.js.es6        |  6 ++--
 .../discourse/components/user-stream.js.es6   |  3 +-
 .../discourse/controllers/auth-token.js.es6   |  3 +-
 .../discourse/controllers/change-owner.js.es6 |  3 +-
 .../controllers/change-timestamp.js.es6       |  3 +-
 .../discourse/controllers/composer.js.es6     |  3 +-
 .../discourse/controllers/exception.js.es6    |  3 +-
 .../controllers/insert-hyperlink.js.es6       |  9 +++--
 .../discourse/controllers/jump-to-post.js.es6 |  3 +-
 .../discourse/controllers/login.js.es6        |  6 ++--
 .../controllers/move-to-topic.js.es6          |  3 +-
 .../second-factor-backup-edit.js.es6          |  3 +-
 .../discourse/controllers/topic.js.es6        |  6 ++--
 .../initializers/asset-version.js.es6         |  3 +-
 .../initializers/auth-complete.js.es6         |  3 +-
 .../discourse/initializers/mobile.js.es6      |  3 +-
 .../javascripts/discourse/lib/ajax.js.es6     |  7 ++--
 .../discourse/lib/autocomplete.js.es6         | 10 +++---
 .../discourse/lib/clean-dom.js.es6            |  3 +-
 .../discourse/lib/click-track.js.es6          |  3 +-
 .../javascripts/discourse/lib/debounce.js.es6 |  3 +-
 .../lib/desktop-notifications.js.es6          |  5 +--
 .../discourse/lib/keyboard-shortcuts.js.es6   |  8 +++--
 .../lib/link-category-hashtags.js.es6         |  3 +-
 .../discourse/lib/link-mentions.js.es6        |  3 +-
 .../discourse/lib/link-tag-hashtag.js.es6     |  3 +-
 .../discourse/lib/load-script.js.es6          |  3 +-
 .../discourse/lib/page-tracker.js.es6         |  3 +-
 .../discourse/lib/safari-hacks.js.es6         |  3 +-
 .../discourse/lib/screen-track.js.es6         |  3 +-
 .../javascripts/discourse/lib/throttle.js.es6 |  3 +-
 .../javascripts/discourse/lib/url.js.es6      | 10 +++---
 .../mixins/card-contents-base.js.es6          |  9 +++--
 .../discourse/mixins/docking.js.es6           |  3 +-
 .../mixins/mobile-scroll-direction.js.es6     |  3 +-
 .../discourse/mixins/scroll-top.js.es6        |  3 +-
 .../discourse/mixins/scrolling.js.es6         |  3 +-
 .../discourse/models/composer.js.es6          |  9 +++--
 .../discourse/routes/application.js.es6       |  6 ++--
 .../discourse/routes/associate-account.js.es6 |  3 +-
 .../discourse/routes/discourse.js.es6         |  3 +-
 .../routes/discovery-categories.js.es6        |  3 +-
 .../discourse/routes/forgot-password.js.es6   |  3 +-
 .../javascripts/discourse/routes/login.js.es6 |  3 +-
 .../discourse/routes/new-message.js.es6       |  5 +--
 .../discourse/routes/new-topic.js.es6         |  3 +-
 .../discourse/routes/signup.js.es6            |  5 +--
 .../discourse/routes/topic-from-params.js.es6 |  3 +-
 .../javascripts/discourse/routes/topic.js.es6 | 13 +++++---
 .../widgets/component-connector.js.es6        |  3 +-
 .../discourse/widgets/connector.js.es6        |  3 +-
 .../javascripts/discourse/widgets/glue.js.es6 |  8 +++--
 .../discourse/widgets/hamburger-menu.js.es6   |  3 +-
 .../discourse/widgets/header.js.es6           |  3 +-
 .../discourse/widgets/post-menu.js.es6        |  6 ++--
 .../discourse/widgets/post-stream.js.es6      |  3 +-
 .../discourse/widgets/search-menu.js.es6      |  6 ++--
 .../discourse/widgets/topic-timeline.js.es6   |  3 +-
 .../discourse/widgets/user-menu.js.es6        |  3 +-
 .../javascripts/pretty-text/oneboxer.js.es6   |  5 +--
 .../pretty-text/upload-short-url.js.es6       |  3 +-
 .../select-kit/mixins/dom-helpers.js.es6      | 14 ++++----
 .../select-kit/mixins/events.js.es6           |  8 +++--
 .../wizard/components/invite-list.js.es6      |  3 +-
 .../wizard/components/radio-button.js.es6     |  3 +-
 .../wizard/components/wizard-step.js.es6      |  5 +--
 app/assets/javascripts/wizard/lib/ajax.js.es6 |  5 +--
 .../javascripts/wizard/lib/preview.js.es6     |  3 +-
 .../wizard/test/acceptance/wizard-test.js.es6 |  3 +-
 .../wizard/test/helpers/start-app.js.es6      |  3 +-
 .../discourse-local-dates-create-form.js.es6  |  7 ++--
 .../composer-presence-display.js.es6          | 13 +++++---
 .../components/topic-presence-display.js.es6  |  6 ++--
 .../acceptance/composer-test.js.es6           |  3 +-
 test/javascripts/acceptance/modal-test.js.es6 |  3 +-
 .../components/d-editor-test.js.es6           |  3 +-
 .../javascripts/controllers/topic-test.js.es6 |  3 +-
 test/javascripts/helpers/qunit-helpers.js.es6 |  6 ++--
 test/javascripts/lib/click-track-test.js.es6  |  3 +-
 test/javascripts/models/nav-item-test.js.es6  |  3 +-
 test/javascripts/widgets/widget-test.js.es6   |  3 +-
 151 files changed, 485 insertions(+), 270 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
index 67bc308948..ccacb2e705 100644
--- a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { renderSpinner } from "discourse/helpers/loading-spinner";
@@ -53,7 +54,7 @@ export default Component.extend(
       // force rerender
       this.rerenderBuffer();
 
-      Ember.run.scheduleOnce("afterRender", this, this._scrollDown);
+      scheduleOnce("afterRender", this, this._scrollDown);
     }, 150),
 
     buildBuffer(buffer) {
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 6ad48208b4..1f23998d6b 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
@@ -11,7 +13,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      Ember.run.debounce(this, this._scheduleChartRendering, 500);
+      debounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -31,11 +33,11 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    Ember.run.debounce(this, this._scheduleChartRendering, 100);
+    debounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this._renderChart(
         this.model,
         this.element && this.element.querySelector(".chart-canvas")
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 1d70da8fed..77604527ed 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,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
@@ -9,7 +11,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      Ember.run.debounce(this, this._scheduleChartRendering, 500);
+      debounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -29,11 +31,11 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    Ember.run.debounce(this, this._scheduleChartRendering, 100);
+    debounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       if (!this.element) {
         return;
       }
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 4efdf09926..5b3fbdd9a5 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -313,7 +314,7 @@ export default Component.extend({
 
     this.setProperties({ isLoading: true, rateLimitationString: null });
 
-    Ember.run.next(() => {
+    next(() => {
       let payload = this._buildPayload(["prev_period"]);
 
       const callback = response => {
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
index 8120456821..1dec9fce37 100644
--- a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
+++ b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
@@ -83,7 +84,7 @@ export default Component.extend({
 
     toggleMaximize: function() {
       this.toggleProperty("maximized");
-      Ember.run.next(() => this.appEvents.trigger("ace:resize"));
+      next(() => this.appEvents.trigger("ace:resize"));
     },
 
     onlyOverriddenChanged(value) {
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.es6
index 7b6cef4527..f186b291f1 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import UserField from "admin/models/user-field";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -28,7 +29,7 @@ export default Component.extend(bufferedProperty("userField"), {
   @observes("editing")
   _focusOnEdit() {
     if (this.editing) {
-      Ember.run.scheduleOnce("afterRender", this, "_focusName");
+      scheduleOnce("afterRender", this, "_focusName");
     }
   },
 
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index f6f0025354..6c02f78dd5 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as loadScript, loadCSS } from "discourse/lib/load-script";
 
@@ -37,7 +38,7 @@ export default Component.extend({
   didInsertElement() {
     loadScript("/javascripts/spectrum.js").then(() => {
       loadCSS("/javascripts/spectrum.css").then(() => {
-        Ember.run.schedule("afterRender", () => {
+        schedule("afterRender", () => {
           $(this.element.querySelector(".picker"))
             .spectrum({ color: "#" + this.hexValue })
             .on("change.spectrum", (me, color) => {
@@ -47,7 +48,7 @@ export default Component.extend({
         });
       });
     });
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.hexValueChanged();
     });
   }
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index 746bfeede3..debb6b25b1 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
@@ -14,7 +15,7 @@ export default Component.extend(bufferedProperty("host"), {
   @on("didInsertElement")
   @observes("editing")
   _focusOnInput() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.element.querySelector(".host-name").focus();
     });
   },
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index f97deff711..8438a4ee5c 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -78,7 +79,7 @@ export default Component.extend({
       $(document.body).append($copyRange);
       if (copyText(text, $copyRange[0])) {
         this.set("copied", true);
-        Ember.run.later(() => this.set("copied", false), 2000);
+        later(() => this.set("copied", false), 2000);
       }
       $copyRange.remove();
     },
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index dcb3bd3ba5..7fefa0f3e5 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -23,7 +24,7 @@ export default Component.extend({
 
       // If we switch to edit mode, jump to the edit textarea
       if (postAction === "edit") {
-        Ember.run.scheduleOnce("afterRender", () => {
+        scheduleOnce("afterRender", () => {
           let elem = this.element;
           let body = elem.closest(".modal-body");
           body.scrollTop(body.height());
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 74efe085d9..b1f82ea295 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
@@ -20,7 +21,7 @@ export default Component.extend({
   },
 
   focusPermalink() {
-    Ember.run.schedule("afterRender", () =>
+    schedule("afterRender", () =>
       this.element.querySelector(".permalink-url").focus()
     );
   },
@@ -69,7 +70,7 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element.querySelector(".external-url")).keydown(e => {
         // enter key
         if (e.keyCode === 13) {
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 8f6a291325..344e76deb6 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,5 @@
+import { schedule } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -45,18 +47,18 @@ export default Component.extend(
         this.resumable.upload();
 
         // mark as uploading
-        Ember.run.later(() => this.set("isUploading", true));
+        later(() => this.set("isUploading", true));
       });
 
       this.resumable.on("fileProgress", file => {
         // update progress
-        Ember.run.later(() =>
+        later(() =>
           this.set("progress", parseInt(file.progress() * 100, 10))
         );
       });
 
       this.resumable.on("fileSuccess", file => {
-        Ember.run.later(() => {
+        later(() => {
           // mark as not uploading anymore
           this._reset();
 
@@ -66,7 +68,7 @@ export default Component.extend(
       });
 
       this.resumable.on("fileError", (file, message) => {
-        Ember.run.later(() => {
+        later(() => {
           // mark as not uploading anymore
           this._reset();
 
@@ -78,7 +80,7 @@ export default Component.extend(
 
     @on("didInsertElement")
     _assignBrowse() {
-      Ember.run.schedule("afterRender", () =>
+      schedule("afterRender", () =>
         this.resumable.assignBrowse($(this.element))
       );
     },
@@ -117,7 +119,7 @@ export default Component.extend(
     click() {
       if (this.isUploading) {
         this.resumable.cancel();
-        Ember.run.later(() => this._reset());
+        later(() => this._reset());
         return false;
       } else {
         return true;
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.es6
index 1b20d7f39c..8b6db57764 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /**
   A form to create an IP address that will be blocked or whitelisted.
@@ -62,7 +63,7 @@ export default Component.extend({
           .then(result => {
             this.setProperties({ ip_address: "", formSubmitted: false });
             this.action(ScreenedIpAddress.create(result.screened_ip_address));
-            Ember.run.schedule("afterRender", () =>
+            schedule("afterRender", () =>
               this.element.querySelector(".ip-address-input").focus()
             );
           })
@@ -84,7 +85,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _init() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element.querySelector(".ip-address-input")).keydown(e => {
         if (e.keyCode === 13) {
           this.send("submit");
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 62e5dff884..6d68f4d8e3 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -33,7 +34,7 @@ export default Component.extend({
   },
 
   scheduleAnimation() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.animate(true);
     });
   },
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index 919f6de9ef..74bbeeff1e 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import WatchedWord from "admin/models/watched-word";
 import {
@@ -64,7 +65,7 @@ export default Component.extend({
               message: I18n.t("admin.watched_words.form.success")
             });
             this.action(WatchedWord.create(result));
-            Ember.run.schedule("afterRender", () =>
+            schedule("afterRender", () =>
               this.element.querySelector(".watched-word-input").focus()
             );
           })
@@ -86,7 +87,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _init() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element.querySelector(".watched-word-input")).keydown(e => {
         if (e.keyCode === 13) {
           this.send("submit");
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.es6
index df5d71d3de..ce99c2cfea 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -41,7 +42,7 @@ export default Controller.extend({
         );
       }
 
-      Ember.run.later(() => {
+      later(() => {
         this.set("model.savingStatus", null);
       }, 2000);
 
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 12cc0400f1..b582f733aa 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 const { get } = Ember;
@@ -21,7 +22,7 @@ export default Controller.extend({
 
   actions: {
     filterReports(filter) {
-      Ember.run.debounce(this, this._performFiltering, filter, 250);
+      debounce(this, this._performFiltering, filter, 250);
     }
   },
 
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.es6
index da3afb72c5..65df52b7f6 100644
--- 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.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
@@ -68,7 +69,7 @@ export default Controller.extend({
   },
 
   scheduleRefresh() {
-    Ember.run.scheduleOnce("afterRender", this, this._refresh);
+    scheduleOnce("afterRender", this, this._refresh);
   },
 
   actions: {
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.es6
index 15a16be72b..1a1b266ae1 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
 let lastSearch;
 
@@ -27,14 +28,14 @@ export default Controller.extend({
     toggleOverridden() {
       this.toggleProperty("overridden");
       this.set("searching", true);
-      Ember.run.debounce(this, this._performSearch, 400);
+      debounce(this, this._performSearch, 400);
     },
 
     search() {
       const q = this.q;
       if (q !== lastSearch) {
         this.set("searching", true);
-        Ember.run.debounce(this, this._performSearch, 400);
+        debounce(this, this._performSearch, 400);
         lastSearch = q;
       }
     }
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 51f1787fe0..eed2c23ec4 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
@@ -71,7 +72,7 @@ export default Controller.extend(GrantBadgeController, {
       ).then(
         () => {
           this.set("badgeReason", "");
-          Ember.run.next(() => {
+          next(() => {
             // Update the selected badge ID after the combobox has re-rendered.
             const newSelectedBadge = this.grantableBadges[0];
             if (newSelectedBadge) {
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 be982921db..4435eb9b25 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,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
@@ -51,7 +52,7 @@ export default Controller.extend({
       if (a) {
         a.words.unshiftObject(arg);
         a.incrementProperty("count");
-        Ember.run.schedule("afterRender", () => {
+        schedule("afterRender", () => {
           // remove from other actions lists
           let match = null;
           this.get("adminWatchedWords.model").forEach(action => {
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
index 8e23ba55ee..d3d301212a 100644
--- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 // Ember 2.0 removes buffered rendering, but we can still implement it ourselves.
 // In the long term we'll want to remove this.
 
@@ -13,7 +14,7 @@ const Mixin = {
   },
 
   rerenderBuffer() {
-    Ember.run.scheduleOnce("render", this, this._customRender);
+    scheduleOnce("render", this, this._customRender);
   }
 };
 
diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
index 3f70e353b8..974d73c958 100644
--- a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
+++ b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
@@ -1,10 +1,11 @@
+import { bind } from "@ember/runloop";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Mixin.create({
   ready() {
     this._super(...arguments);
 
-    this._onChangeHandler = Ember.run.bind(this, this._onChange);
+    this._onChangeHandler = bind(this, this._onChange);
 
     // Default to true
     Discourse.set("hasFocus", true);
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 1762d116aa..52ad20808c 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -14,6 +14,18 @@ var define, requirejs;
       "@ember/object": { default: Ember.Object },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
       "@ember/routing/route": { default: Ember.Route },
+      "@ember/runloop": {
+        bind: Ember.run.bind,
+        cancel: Ember.run.cancel,
+        debounce: Ember.run.debounce,
+        later: Ember.run.later,
+        next: Ember.run.next,
+        once: Ember.run.once,
+        run: Ember.run,
+        schedule: Ember.run.schedule,
+        scheduleOnce: Ember.run.scheduleOnce,
+        throttle: Ember.run.throttle
+      },
       "@ember/service": {
         default: Ember.Service,
         inject: Ember.inject.service
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.es6
index 209367e829..d4a75e6ebe 100644
--- a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
+++ b/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
@@ -26,7 +27,7 @@ export default Component.extend({
 
   @observes("category.fullSlug", "tags")
   refreshClass() {
-    Ember.run.scheduleOnce("afterRender", this, this._updateClass);
+    scheduleOnce("afterRender", this, this._updateClass);
   },
 
   _removeClass() {
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index b4518c2c4f..c6dd177fe9 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
@@ -57,7 +58,7 @@ export default Component.extend({
     chooseMessage(message) {
       const messageId = Ember.get(message, "id");
       this.set("selectedTopicId", messageId);
-      Ember.run.next(() =>
+      next(() =>
         $(`#choose-message-${messageId}`).prop("checked", "true")
       );
       return false;
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index df0d3b1c47..a31aa5eee4 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
@@ -62,7 +63,7 @@ export default Component.extend({
   actions: {
     chooseTopic(topic) {
       this.set("selectedTopicId", topic.id);
-      Ember.run.next(() => {
+      next(() => {
         document.getElementById(`choose-topic-${topic.id}`).checked = true;
       });
       return false;
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index 7fea43389d..f265917279 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -1,3 +1,8 @@
+import { throttle } from "@ember/runloop";
+import { run } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -60,7 +65,7 @@ export default Component.extend(KeyEnterEscape, {
     "composer.canEditTopicFeaturedLink"
   )
   resize() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       if (!this.element || this.isDestroying || this.isDestroyed) {
         return;
       }
@@ -78,8 +83,8 @@ export default Component.extend(KeyEnterEscape, {
 
     // One second from now, check to see if the last key was hit when
     // we recorded it. If it was, the user paused typing.
-    Ember.run.cancel(this._lastKeyTimeout);
-    this._lastKeyTimeout = Ember.run.later(() => {
+    cancel(this._lastKeyTimeout);
+    this._lastKeyTimeout = later(() => {
       if (lastKeyUp !== this._lastKeyUp) {
         return;
       }
@@ -116,7 +121,7 @@ export default Component.extend(KeyEnterEscape, {
 
     const throttledPerformDrag = (event => {
       event.preventDefault();
-      Ember.run.throttle(this, performDrag, event, THROTTLE_RATE);
+      throttle(this, performDrag, event, THROTTLE_RATE);
     }).bind(this);
 
     const endDrag = () => {
@@ -153,7 +158,7 @@ export default Component.extend(KeyEnterEscape, {
     this._super(...arguments);
     this.setupComposerResizeEvents();
 
-    const resize = () => Ember.run(() => this.resize());
+    const resize = () => run(() => this.resize());
     const triggerOpen = () => {
       if (this.get("composer.composeState") === Composer.OPEN) {
         this.appEvents.trigger("composer:opened");
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index cc419e1af9..c9ccf82fa6 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,3 +1,8 @@
+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 Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import {
@@ -183,7 +188,7 @@ export default Component.extend({
         transformComplete: v => v.username || v.name,
         afterComplete() {
           // ensures textarea scroll position is correct
-          Ember.run.scheduleOnce("afterRender", () => $input.blur().focus());
+          scheduleOnce("afterRender", () => $input.blur().focus());
         }
       });
     }
@@ -192,7 +197,7 @@ export default Component.extend({
       this._initInputPreviewSync($input, $preview);
     } else {
       $input.on("scroll", () =>
-        Ember.run.throttle(
+        throttle(
           this,
           this._syncEditorAndPreviewScroll,
           $input,
@@ -316,7 +321,7 @@ export default Component.extend({
       this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
     });
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       $input.on("touchstart mouseenter", () => {
         if (!$preview.is(":visible")) return;
         $preview.off("scroll");
@@ -342,7 +347,7 @@ export default Component.extend({
       this.set("shouldBuildScrollMap", false);
     }
 
-    Ember.run.throttle(this, $callback, $input, $preview, this.scrollMap, 20);
+    throttle(this, $callback, $input, $preview, this.scrollMap, 20);
   },
 
   _teardownInputPreviewSync() {
@@ -559,7 +564,7 @@ export default Component.extend({
   },
 
   _warnMentionedGroups($preview) {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       var found = this.warnedGroupMentions || [];
       $preview.find(".mention-group.notify").each((idx, e) => {
         const $e = $(e);
@@ -587,7 +592,7 @@ export default Component.extend({
       return;
     }
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       let found = this.warnedCannotSeeMentions || [];
 
       $preview.find(".mention.cannot-see").each((idx, e) => {
@@ -597,7 +602,7 @@ export default Component.extend({
         if (found.indexOf(name) === -1) {
           // add a delay to allow for typing, so you don't open the warning right away
           // previously we would warn after @bob even if you were about to mention @bob2
-          Ember.run.later(
+          later(
             this,
             () => {
               if (
@@ -618,7 +623,7 @@ export default Component.extend({
   },
 
   _resetUpload(removePlaceholder) {
-    Ember.run.next(() => {
+    next(() => {
       if (this._validUploads > 0) {
         this._validUploads--;
       }
@@ -897,9 +902,9 @@ export default Component.extend({
   @on("willDestroyElement")
   _composerClosed() {
     this.appEvents.trigger("composer:will-close");
-    Ember.run.next(() => {
+    next(() => {
       // need to wait a bit for the "slide down" transition of the composer
-      Ember.run.later(
+      later(
         () => this.appEvents.trigger("composer:closed"),
         Ember.testing ? 0 : 400
       );
@@ -970,7 +975,7 @@ export default Component.extend({
       // Paint mentions
       const unseenMentions = linkSeenMentions($preview, this.siteSettings);
       if (unseenMentions.length) {
-        Ember.run.debounce(
+        debounce(
           this,
           this._renderUnseenMentions,
           $preview,
@@ -985,7 +990,7 @@ export default Component.extend({
       // Paint category hashtags
       const unseenCategoryHashtags = linkSeenCategoryHashtags($preview);
       if (unseenCategoryHashtags.length) {
-        Ember.run.debounce(
+        debounce(
           this,
           this._renderUnseenCategoryHashtags,
           $preview,
@@ -998,7 +1003,7 @@ export default Component.extend({
       if (this.siteSettings.tagging_enabled) {
         const unseenTagHashtags = linkSeenTagHashtags($preview);
         if (unseenTagHashtags.length) {
-          Ember.run.debounce(
+          debounce(
             this,
             this._renderUnseenTagHashtags,
             $preview,
@@ -1009,7 +1014,7 @@ export default Component.extend({
       }
 
       // Paint oneboxes
-      Ember.run.debounce(
+      debounce(
         this,
         () => {
           const oneboxes = {};
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index fb07997b80..82a4fceeaf 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import LinkLookup from "discourse/lib/link-lookup";
 
@@ -24,7 +25,7 @@ export default Component.extend({
     this.appEvents.on("composer:find-similar", this, this._findSimilar);
     this.appEvents.on("composer-messages:close", this, this._closeTop);
     this.appEvents.on("composer-messages:create", this, this._create);
-    Ember.run.scheduleOnce("afterRender", this, this.reset);
+    scheduleOnce("afterRender", this, this.reset);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 459d1bd0a6..540f1b36eb 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,3 +1,6 @@
+import { next } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -24,7 +27,7 @@ export default Component.extend({
     }
 
     if (this.get("composer.titleLength") > 0) {
-      Ember.run.debounce(this, this._titleChanged, 10);
+      debounce(this, this._titleChanged, 10);
     }
   },
 
@@ -79,13 +82,13 @@ export default Component.extend({
     }
 
     if (Ember.testing) {
-      Ember.run.next(() =>
+      next(() =>
         // not ideal but we don't want to run this in current
         // runloop to avoid an error in console
         this._checkForUrl()
       );
     } else {
-      Ember.run.debounce(this, this._checkForUrl, 500);
+      debounce(this, this._checkForUrl, 500);
     }
   },
 
@@ -134,14 +137,14 @@ export default Component.extend({
           })
           .finally(() => {
             this.set("composer.loading", false);
-            Ember.run.schedule("afterRender", () => {
+            schedule("afterRender", () => {
               $(this.element.querySelector("input")).putCursorAtEnd();
             });
           });
       } else {
         this._updatePost(loadOnebox);
         this.set("composer.loading", false);
-        Ember.run.schedule("afterRender", () => {
+        schedule("afterRender", () => {
           $(this.element.querySelector("input")).putCursorAtEnd();
         });
       }
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
index 694db1cfd3..3e9aa03784 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -76,7 +77,7 @@ export default Component.extend({
     toggleSelector() {
       this.set("showSelector", true);
 
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         $(this.element)
           .find("input")
           .focus();
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index e9e19b338f..256636a3c5 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { cookAsync } from "discourse/lib/text";
 import { ajax } from "discourse/lib/ajax";
@@ -12,7 +13,7 @@ const CookText = Component.extend({
       this.set("cooked", cooked);
       // no choice but to defer this cause
       // pretty text may only be loaded now
-      Ember.run.next(() =>
+      next(() =>
         window
           .requireModule("pretty-text/upload-short-url")
           .resolveAllShortUrls(ajax)
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 185223be34..4b95ddc814 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,3 +1,8 @@
+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 { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /*global Mousetrap:true */
@@ -249,7 +254,7 @@ export default Component.extend({
     this._applyEmojiAutocomplete($editorInput);
     this._applyCategoryHashtagAutocomplete($editorInput);
 
-    Ember.run.scheduleOnce("afterRender", this, this._readyNow);
+    scheduleOnce("afterRender", this, this._readyNow);
 
     const mouseTrap = Mousetrap(this.element.querySelector(".d-editor-input"));
     const shortcuts = this.get("toolbar.shortcuts");
@@ -348,7 +353,7 @@ export default Component.extend({
         return;
       }
       this.set("preview", cooked);
-      Ember.run.scheduleOnce("afterRender", () => {
+      scheduleOnce("afterRender", () => {
         if (this._state !== "inDOM") {
           return;
         }
@@ -372,7 +377,7 @@ export default Component.extend({
     if (Ember.testing) {
       this._updatePreview();
     } else {
-      Ember.run.debounce(this, this._updatePreview, 30);
+      debounce(this, this._updatePreview, 30);
     }
   },
 
@@ -432,14 +437,14 @@ export default Component.extend({
             emojiPickerIsActive: true
           });
 
-          Ember.run.schedule("afterRender", () => {
+          schedule("afterRender", () => {
             const filterInput = document.querySelector(
               ".emoji-picker input[name='filter']"
             );
             if (filterInput) {
               filterInput.value = v.term;
 
-              Ember.run.later(
+              later(
                 () => filterInput.dispatchEvent(new Event("input")),
                 50
               );
@@ -547,7 +552,7 @@ export default Component.extend({
   },
 
   _selectText(from, length) {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       const textarea = this.element.querySelector("textarea.d-editor-input");
       const $textarea = $(textarea);
       const oldScrollPos = $textarea.scrollTop();
@@ -556,7 +561,7 @@ export default Component.extend({
       }
       textarea.selectionStart = from;
       textarea.selectionEnd = from + length;
-      Ember.run.next(() => $textarea.trigger("change"));
+      next(() => $textarea.trigger("change"));
       $textarea.scrollTop(oldScrollPos);
     });
   },
@@ -785,7 +790,7 @@ export default Component.extend({
     $textarea.val(value);
     $textarea.prop("selectionStart", insert.length);
     $textarea.prop("selectionEnd", insert.length);
-    Ember.run.next(() => $textarea.trigger("change"));
+    next(() => $textarea.trigger("change"));
     this._focusTextArea();
   },
 
@@ -886,7 +891,7 @@ export default Component.extend({
   // ensures textarea scroll position is correct
   _focusTextArea() {
     const textarea = this.element.querySelector("textarea.d-editor-input");
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       textarea.blur();
       textarea.focus();
     });
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 33b444d05b..a8543095ab 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   classNames: ["modal-body"],
@@ -14,7 +15,7 @@ export default Component.extend({
       fixedParent.modal("show");
     }
 
-    Ember.run.scheduleOnce("afterRender", this, this._afterFirstRender);
+    scheduleOnce("afterRender", this, this._afterFirstRender);
     this.appEvents.on("modal-body:flash", this, "_flash");
     this.appEvents.on("modal-body:clearFlash", this, "_clearFlash");
   },
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 0c83f529ad..19d4d2264c 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 import Component from "@ember/component";
 
@@ -32,11 +33,11 @@ export default Component.extend({
   setUp() {
     $("html").on("keydown.discourse-modal", e => {
       if (e.which === 27 && this.dismissable) {
-        Ember.run.next(() => $(".modal-header button.modal-close").click());
+        next(() => $(".modal-header button.modal-close").click());
       }
 
       if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        Ember.run.next(() => $(".modal-footer .btn-primary").click());
+        next(() => $(".modal-footer .btn-primary").click());
       }
     });
 
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js.es6
index 0161fb8aa2..927be37881 100644
--- a/app/assets/javascripts/discourse/components/date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/date-input.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -37,7 +38,7 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      Ember.run.next(() => {
+      next(() => {
         const default_opts = {
           field: this.element.querySelector(".date-picker"),
           container: container || this.element,
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index 7fc28a50ef..e9403326bb 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -30,7 +31,7 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      Ember.run.next(() => {
+      next(() => {
         const options = {
           field: this.element.querySelector(".date-picker"),
           container: container || null,
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 53ab8edbbe..796e0a9068 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,3 +1,7 @@
+import { throttle } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import AddArchetypeClass from "discourse/mixins/add-archetype-class";
@@ -50,13 +54,13 @@ export default Component.extend(
       const enteredAt = this.enteredAt;
       if (enteredAt && this.lastEnteredAt !== enteredAt) {
         this._lastShowTopic = null;
-        Ember.run.schedule("afterRender", () => this.scrolled());
+        schedule("afterRender", () => this.scrolled());
         this.set("lastEnteredAt", enteredAt);
       }
     },
 
     _highlightPost(postNumber) {
-      Ember.run.scheduleOnce("afterRender", null, highlight, postNumber);
+      scheduleOnce("afterRender", null, highlight, postNumber);
     },
 
     _hideTopicInHeader() {
@@ -78,7 +82,7 @@ export default Component.extend(
           this.pauseHeaderTopicUpdate = true;
           this._lastShowTopic = true;
 
-          Ember.run.later(() => {
+          later(() => {
             this._lastShowTopic = false;
             this.pauseHeaderTopicUpdate = false;
           }, debounceDuration);
@@ -192,7 +196,7 @@ export default Component.extend(
       // at the start of the scroll. This feels a lot more snappy compared to waiting
       // for the scroll to end if we debounce.
       if (this.site.mobileView && this.hasScrolled) {
-        Ember.run.throttle(
+        throttle(
           this,
           this.calculateDirection,
           offset,
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 c9b2bb92bb..9c6cb779c2 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -1,3 +1,5 @@
+import { schedule } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
@@ -12,11 +14,11 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
   _readjustScrollPosition() {
     const scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      Ember.run.schedule("afterRender", () =>
+      schedule("afterRender", () =>
         $(window).scrollTop(scrollTo + 1)
       );
     } else {
-      Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
+      scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
     }
   },
 
@@ -38,7 +40,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
     loadMore() {
       Discourse.updateContextCount(0);
       this.model.loadMore().then(hasMoreResults => {
-        Ember.run.schedule("afterRender", () => this.saveScrollPosition());
+        schedule("afterRender", () => this.saveScrollPosition());
         if (!hasMoreResults) {
           this.eyeline.flushRest();
         } else if ($(window).height() >= $(document).height()) {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 15aae0ed28..42be7233af 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -20,7 +21,7 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-    Ember.run.scheduleOnce("afterRender", this, this._addToCollection);
+    scheduleOnce("afterRender", this, this._addToCollection);
   },
 
   _addToCollection: function() {
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.es6
index b1d5c79d81..c3254cc3d6 100644
--- a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
@@ -1,9 +1,10 @@
+import { scheduleOnce } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
 export default buildCategoryPanel("topic-template", {
   _activeTabChanged: function() {
     if (this.activeTab) {
-      Ember.run.scheduleOnce("afterRender", () =>
+      scheduleOnce("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
       );
     }
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.es6
index 5d01c739e7..c46af80e2f 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -73,7 +74,7 @@ export default Component.extend({
   @observes("selection")
   _updateBasedOnLastPost() {
     if (!this.autoClose) {
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         this.set("topicTimer.based_on_last_post", false);
       });
     }
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 7008eb1d01..d2b980a8f2 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -1,10 +1,11 @@
+import { scheduleOnce } from "@ember/runloop";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import autosize from "discourse/lib/autosize";
 
 export default Ember.TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       $(this.element).focus();
       autosize(this.element);
     });
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js.es6
index f039b30660..b52f544907 100644
--- a/app/assets/javascripts/discourse/components/flag-selection.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-selection.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
@@ -16,6 +17,6 @@ export default Component.extend({
 
   @observes("nameKey")
   selectedChanged() {
-    Ember.run.next(this, this._selectRadio);
+    next(this, this._selectRadio);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js.es6 b/app/assets/javascripts/discourse/components/footer-nav.js.es6
index 7ac143225a..d94910364e 100644
--- a/app/assets/javascripts/discourse/components/footer-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/footer-nav.js.es6
@@ -1,3 +1,4 @@
+import { throttle } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import MobileScrollDirection from "discourse/mixins/mobile-scroll-direction";
 import Scrolling from "discourse/mixins/scrolling";
@@ -78,7 +79,7 @@ const FooterNavComponent = MountWidget.extend(
 
       const offset = window.pageYOffset || $("html").scrollTop();
 
-      Ember.run.throttle(
+      throttle(
         this,
         this.calculateDirection,
         offset,
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 5bacd98013..571d895f84 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,3 +1,4 @@
+import { bind } from "@ember/runloop";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
@@ -88,10 +89,10 @@ export default Component.extend(
 
     @on("didInsertElement")
     _setupLogsNotice() {
-      this._boundRerenderBuffer = Ember.run.bind(this, this.rerenderBuffer);
+      this._boundRerenderBuffer = bind(this, this.rerenderBuffer);
       LogsNotice.current().addObserver("hidden", this._boundRerenderBuffer);
 
-      this._boundResetCurrentProp = Ember.run.bind(
+      this._boundResetCurrentProp = bind(
         this,
         this._resetCurrentProp
       );
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index a80512b93d..a190ffda1d 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -25,7 +26,7 @@ export default Component.extend({
 
   @observes("model.flair_url")
   _loadSVGIcon() {
-    Ember.run.debounce(this, this._loadIcon, 1000);
+    debounce(this, this._loadIcon, 1000);
   },
 
   _loadIcon() {
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 9142c17e60..ca919959a8 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
@@ -77,13 +78,13 @@ export default Component.extend(UploadMixin, {
   },
 
   _openLightbox() {
-    Ember.run.next(() =>
+    next(() =>
       $(this.element.querySelector("a.lightbox")).magnificPopup("open")
     );
   },
 
   _applyLightbox() {
-    if (this.imageUrl) Ember.run.next(() => lightbox($(this.element)));
+    if (this.imageUrl) next(() => lightbox($(this.element)));
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js.es6
index 653761018e..19015ec0e8 100644
--- a/app/assets/javascripts/discourse/components/link-to-input.js.es6
+++ b/app/assets/javascripts/discourse/components/link-to-input.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   showInput: false,
@@ -5,7 +6,7 @@ export default Component.extend({
   click() {
     this.onClick();
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element)
         .find("input")
         .focus();
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
index e8bbe98c87..2ee72f8722 100644
--- a/app/assets/javascripts/discourse/components/login-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
@@ -14,7 +15,7 @@ export default Component.extend({
       this.set("loginName", $.cookie("email"));
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(
         "#login-account-password, #login-account-name, #login-second-factor"
       ).keydown(e => {
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index a60a107079..a47c09c5c4 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 
@@ -21,7 +22,7 @@ export default Component.extend({
   @observes("currentPath")
   currentPathChanged() {
     this.set("expanded", false);
-    Ember.run.next(() => this._updateSelectedHtml());
+    next(() => this._updateSelectedHtml());
   },
 
   _updateSelectedHtml() {
@@ -41,7 +42,7 @@ export default Component.extend({
     toggleExpanded() {
       this.toggleProperty("expanded");
 
-      Ember.run.next(() => {
+      next(() => {
         if (this.expanded) {
           $(window)
             .off("click.mobile-nav")
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 5f0e584977..1363750b81 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
 import { WidgetClickHook } from "discourse/widgets/hooks";
@@ -50,7 +52,7 @@ export default Component.extend({
 
     this._rootNode = document.createElement("div");
     this.element.appendChild(this._rootNode);
-    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
+    this._timeout = scheduleOnce("render", this, this.rerenderWidget);
   },
 
   willClearRender() {
@@ -68,7 +70,7 @@ export default Component.extend({
       const [eventName, caller] = evt;
       this.appEvents.off(eventName, this, caller);
     });
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
   },
 
   afterRender() {},
@@ -97,13 +99,13 @@ export default Component.extend({
       this._renderCallback = callback;
     }
 
-    Ember.run.scheduleOnce("render", this, this.rerenderWidget);
+    scheduleOnce("render", this, this.rerenderWidget);
   },
 
   buildArgs() {},
 
   rerenderWidget() {
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
 
     if (this._rootNode) {
       if (!this._widgetClass) {
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 01dacde789..bf2947fc1d 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -69,7 +70,7 @@ export default Component.extend({
       if (this.expanded) {
         DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        Ember.run.next(() => {
+        next(() => {
           if (!this.expanded) {
             return;
           }
@@ -77,7 +78,7 @@ export default Component.extend({
           $(this.element.querySelector(".drop a")).on("click", () => {
             this.element.querySelector(".drop").style.display = "none";
 
-            Ember.run.next(() => {
+            next(() => {
               if (!this.element || this.isDestroying || this.isDestroyed) {
                 return;
               }
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
index b6c9df818b..a82f76518b 100644
--- a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
@@ -1,3 +1,4 @@
+import { bind } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -18,7 +19,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _registerListener() {
-    this._promptEventHandler = Ember.run.bind(
+    this._promptEventHandler = bind(
       this,
       this._handleInstallPromptEvent
     );
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index f16bf6690d..ec8b8c47e8 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { selectedText } from "discourse/lib/utilities";
@@ -103,7 +104,7 @@ export default Component.extend({
     }
 
     // change the position of the button
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       let top = markerOffset.top;
       let left = markerOffset.left + Math.max(0, parentScrollLeft);
 
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
index dad7447f0c..7637845c1e 100644
--- a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
+++ b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import Scrolling from "discourse/mixins/scrolling";
 
@@ -19,7 +20,7 @@ export default Component.extend(Scrolling, {
 
     const data = this.session.get(this.trackerName);
     if (data && data.position >= 0 && data.tag === this.tag) {
-      Ember.run.next(() => $(window).scrollTop(data.position + 1));
+      next(() => $(window).scrollTop(data.position + 1));
     }
   },
 
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 89a48126f3..38f6536b9d 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,3 +1,6 @@
+import { next } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
+import { 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";
@@ -204,7 +207,7 @@ export default MountWidget.extend({
               // will cause the browser to scroll to the top of the document
               // in Chrome. This makes sure the scroll works correctly if that
               // happens.
-              Ember.run.next(() => $("html, body").scrollTop(whereY));
+              next(() => $("html, body").scrollTop(whereY));
             }
           });
         };
@@ -270,7 +273,7 @@ export default MountWidget.extend({
   },
 
   _scrollTriggered() {
-    Ember.run.scheduleOnce("afterRender", this, this.scrolled);
+    scheduleOnce("afterRender", this, this.scrolled);
   },
 
   _posted(staged) {
@@ -306,13 +309,13 @@ export default MountWidget.extend({
   },
 
   _debouncedScroll() {
-    Ember.run.debounce(this, this._scrollTriggered, 10);
+    debounce(this, this._scrollTriggered, 10);
   },
 
   didInsertElement() {
     this._super(...arguments);
     const debouncedScroll = () =>
-      Ember.run.debounce(this, this._scrollTriggered, 10);
+      debounce(this, this._scrollTriggered, 10);
 
     this._previouslyNearby = {};
 
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 333b6d6549..8f1779487d 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -72,13 +74,13 @@ export default Component.extend({
 
     this._init();
 
-    Ember.run.scheduleOnce("afterRender", () => this._update());
+    scheduleOnce("afterRender", () => this._update());
   },
 
   @observes("searchTerm")
   _updateOptions() {
     this._update();
-    Ember.run.debounce(this, this._update, 250);
+    debounce(this, this._update, 250);
   },
 
   _init() {
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6
index 65f5cfd964..45b9317145 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/share-panel.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -47,7 +48,7 @@ export default Component.extend({
       this.element.querySelector(".topic-share-url-for-touch a")
     );
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       if (!this.capabilities.touch) {
         $linkForTouch.parent().remove();
 
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 17e05c47c9..49d8f67723 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,3 +1,5 @@
+import { bind } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
@@ -89,7 +91,7 @@ export default Component.extend({
     this.set("link", url);
     this.set("visible", true);
 
-    Ember.run.scheduleOnce("afterRender", this, this._focusUrl);
+    scheduleOnce("afterRender", this, this._focusUrl);
   },
 
   _mouseDownHandler(event) {
@@ -154,9 +156,9 @@ export default Component.extend({
 
   @on("init")
   _setupHandlers() {
-    this._boundMouseDownHandler = Ember.run.bind(this, this._mouseDownHandler);
-    this._boundClickHandler = Ember.run.bind(this, this._clickHandler);
-    this._boundKeydownHandler = Ember.run.bind(this, this._keydownHandler);
+    this._boundMouseDownHandler = bind(this, this._mouseDownHandler);
+    this._boundClickHandler = bind(this, this._clickHandler);
+    this._boundKeydownHandler = bind(this, this._keydownHandler);
   },
 
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index d7630e2681..92df1a672f 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   action: "showCreateAccount",
@@ -10,7 +11,7 @@ export default Component.extend({
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
-      Ember.run.later(
+      later(
         () => this.session.set("showSignupCta", false),
         20 * 1000
       );
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 41c71a48e5..b7b82071c1 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -1,3 +1,6 @@
+import { cancel } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import { observes } from "ember-addons/ember-computed-decorators";
 import Docking from "discourse/mixins/docking";
@@ -38,7 +41,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
   _animateClosing($panel, menuOrigin, windowWidth) {
     $panel.css(menuOrigin, -windowWidth);
     this._animate = true;
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.eventDispatched("dom:clean", "header");
       this._panMenuOffset = 0;
     });
@@ -222,7 +225,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
     this.appEvents.off("header:hide-topic", this, "setTopic");
     this.appEvents.off("dom:clean", this, "_cleanDom");
 
-    Ember.run.cancel(this._scheduledRemoveAnimate);
+    cancel(this._scheduledRemoveAnimate);
     window.cancelAnimationFrame(this._scheduledMovingAnimation);
   },
 
@@ -346,7 +349,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
       if (this._animate) {
         $panel.addClass("animate");
         $headerCloak.addClass("animate");
-        this._scheduledRemoveAnimate = Ember.run.later(() => {
+        this._scheduledRemoveAnimate = later(() => {
           $panel.removeClass("animate");
           $headerCloak.removeClass("animate");
         }, 200);
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 37a4cb2959..d5bc066fb0 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,8 +1,9 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
-    Ember.run.next(null, () => {
+    next(null, () => {
       const $this = $(this.element);
 
       if ($this) {
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js.es6
index c9c65e1034..6ec44fb306 100644
--- a/app/assets/javascripts/discourse/components/time-input.js.es6
+++ b/app/assets/javascripts/discourse/components/time-input.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { isNumeric } from "discourse/lib/utilities";
 
@@ -36,7 +37,7 @@ export default Component.extend({
           this._processMinutesChange(value);
         }
 
-        Ember.run.schedule("afterRender", () => (event.target.value = value));
+        schedule("afterRender", () => (event.target.value = value));
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
index f55197d804..ead6913e82 100644
--- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import CleansUp from "discourse/mixins/cleans-up";
@@ -77,7 +78,7 @@ export default Component.extend(CleansUp, {
 
     this.setProperties({ topic: data.topic, visible: true });
 
-    Ember.run.scheduleOnce("afterRender", this, this._setCSS);
+    scheduleOnce("afterRender", this, this._setCSS);
 
     $("html")
       .off("mousedown.topic-entrance")
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index c099c8b790..44f4a39a69 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -69,7 +70,7 @@ export default Component.extend(LoadMore, {
 
     let scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      Ember.run.schedule("afterRender", () =>
+      schedule("afterRender", () =>
         $(window).scrollTop(scrollTo + 1)
       );
     }
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index 4a67114f1a..b2115e755d 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,4 +1,6 @@
 import EmberObject from "@ember/object";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
@@ -52,7 +54,7 @@ export default Component.extend(PanEvents, {
   },
 
   _checkSize() {
-    Ember.run.scheduleOnce("afterRender", this, this._performCheckSize);
+    scheduleOnce("afterRender", this, this._performCheckSize);
   },
 
   // we need to store this so topic progress has something to init with
@@ -88,7 +90,7 @@ export default Component.extend(PanEvents, {
   composerOpened() {
     this.set("composerOpen", true);
     // we need to do the check after animation is done
-    Ember.run.later(() => this._checkSize(), 500);
+    later(() => this._checkSize(), 500);
   },
 
   composerClosed() {
@@ -99,7 +101,7 @@ export default Component.extend(PanEvents, {
   _collapseFullscreen() {
     if (this.get("info.topicProgressExpanded")) {
       $(".timeline-fullscreen").removeClass("show");
-      Ember.run.later(() => {
+      later(() => {
         if (!this.element || this.isDestroying || this.isDestroyed) {
           return;
         }
@@ -137,7 +139,7 @@ export default Component.extend(PanEvents, {
     } else if (offset <= 0) {
       $timelineContainer.css("bottom", "");
     } else {
-      Ember.run.later(() => this._handlePanDone(offset, event), 20);
+      later(() => this._handlePanDone(offset, event), 20);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 61db49b425..9e3388ca9b 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -73,7 +74,7 @@ export default Component.extend({
 
   @observes("postStream.stream.[]")
   _updateBar() {
-    Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
+    scheduleOnce("afterRender", this, this._updateProgressBar);
   },
 
   _topicScrolled(event) {
@@ -100,16 +101,16 @@ export default Component.extend({
 
     const prevEvent = this.prevEvent;
     if (prevEvent) {
-      Ember.run.scheduleOnce(
+      scheduleOnce(
         "afterRender",
         this,
         this._topicScrolled,
         prevEvent
       );
     } else {
-      Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
+      scheduleOnce("afterRender", this, this._updateProgressBar);
     }
-    Ember.run.scheduleOnce("afterRender", this, this._dock);
+    scheduleOnce("afterRender", this, this._dock);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 1d9ec49b78..9aa6541065 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import Docking from "discourse/mixins/docking";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -94,7 +95,7 @@ export default MountWidget.extend(Docking, {
     this._super(...arguments);
 
     if (this.fullscreen && !this.addShowClass) {
-      Ember.run.next(() => {
+      next(() => {
         this.set("addShowClass", true);
         this.queueRerender();
       });
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 c7e2ed244a..2210a3b47c 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -85,7 +87,7 @@ export default Component.extend(
 
         // TODO Sam: concerned this can cause a heavy rerender loop
         if (!Ember.testing) {
-          this._delayedRerender = Ember.run.later(
+          this._delayedRerender = later(
             this,
             this.rerender,
             rerenderDelay
@@ -110,7 +112,7 @@ export default Component.extend(
       $(this.element).off("click.topic-timer-remove", this.removeTopicTimer);
 
       if (this._delayedRerender) {
-        Ember.run.cancel(this._delayedRerender);
+        cancel(this._delayedRerender);
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index cbb9b779bc..16c7e1fb79 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 import ClickTrack from "discourse/lib/click-track";
@@ -23,7 +24,7 @@ export default Component.extend(LoadMore, {
   classNames: ["user-stream"],
 
   _scrollTopOnModelChange: function() {
-    Ember.run.schedule("afterRender", () => $(document).scrollTop(0));
+    schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
   _inserted: Ember.on("didInsertElement", function() {
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
index 0a02adf223..a24f6a53b1 100644
--- a/app/assets/javascripts/discourse/controllers/auth-token.js.es6
+++ b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
@@ -24,7 +25,7 @@ export default Controller.extend(ModalFunctionality, {
     highlightSecure() {
       this.send("closeModal");
 
-      Ember.run.next(() => {
+      next(() => {
         const $prefPasswordDiv = $(".pref-password");
 
         $prefPasswordDiv.addClass("highlighted");
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 28acef583e..6496ccb0be 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -53,7 +54,7 @@ export default Controller.extend(ModalFunctionality, {
           if (this.get("topicController.multiSelect")) {
             this.topicController.send("toggleMultiSelect");
           }
-          Ember.run.next(() =>
+          next(() =>
             DiscourseURL.routeTo(this.get("topicController.model.url"))
           );
         },
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 7744b066e1..0251ab8883 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -47,7 +48,7 @@ export default Controller.extend(ModalFunctionality, {
         .then(() => {
           this.send("closeModal");
           this.setProperties({ date: "", time: "", saving: false });
-          Ember.run.next(() => DiscourseURL.routeTo(topic.url));
+          next(() => DiscourseURL.routeTo(topic.url));
         })
         .catch(() =>
           this.flash(I18n.t("topic.change_timestamp.error"), "alert-error")
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 01867e7c6a..a4ecfb8476 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -1046,7 +1047,7 @@ export default Controller.extend({
 
   @observes("model.reply", "model.title")
   _shouldSaveDraft() {
-    Ember.run.debounce(this, this._saveDraft, 2000);
+    debounce(this, this._saveDraft, 2000);
   },
 
   @computed("model.categoryId", "lastValidatedAt")
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 7b8a1bec8f..2e3f44ae74 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import {
   on,
@@ -113,7 +114,7 @@ export default Controller.extend({
     tryLoading() {
       this.set("loading", true);
 
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         this.lastTransition.retry();
         this.set("loading", false);
       });
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index e1d714be39..63b724f89c 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,3 +1,6 @@
+import { debounce } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
@@ -15,7 +18,7 @@ export default Controller.extend(ModalFunctionality, {
       selectedRow: -1
     });
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       const element = document.querySelector(".insert-link");
 
       element.addEventListener("keydown", e => this.keyDown(e));
@@ -135,7 +138,7 @@ export default Controller.extend(ModalFunctionality, {
       .closest(".modal-inner-container")
       .removeEventListener("mousedown", this.mouseDown);
 
-    Ember.run.cancel(this._debounced);
+    cancel(this._debounced);
   },
 
   actions: {
@@ -174,7 +177,7 @@ export default Controller.extend(ModalFunctionality, {
       }
     },
     search() {
-      this._debounced = Ember.run.debounce(this, this.triggerSearch, 400);
+      this._debounced = debounce(this, this.triggerSearch, 400);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index af6fd216f5..a0d4bd5950 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -10,7 +11,7 @@ export default Controller.extend(ModalFunctionality, {
   ),
 
   onShow() {
-    Ember.run.next(() => $("#post-jump").focus());
+    next(() => $("#post-jump").focus());
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index ca94d979c0..2501146805 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,4 +1,6 @@
 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 { ajax } from "discourse/lib/ajax";
@@ -150,7 +152,7 @@ export default Controller.extend(ModalFunctionality, {
 
               // only need to focus the 2FA input for TOTP
               if (!this.showSecurityKey) {
-                Ember.run.scheduleOnce("afterRender", () =>
+                scheduleOnce("afterRender", () =>
                   document
                     .getElementById("second-factor")
                     .querySelector("input")
@@ -322,7 +324,7 @@ export default Controller.extend(ModalFunctionality, {
     const loginError = (errorMsg, className, callback) => {
       showModal("login");
 
-      Ember.run.next(() => {
+      next(() => {
         if (callback) callback();
         this.flash(errorMsg, className || "success");
       });
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 8a89fc8e57..7c8c84648c 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -92,7 +93,7 @@ export default Controller.extend(ModalFunctionality, {
       );
     } else if (!this.canSplitTopic) {
       this.set("selection", "existing_topic");
-      Ember.run.next(() => $("#choose-topic-title").focus());
+      next(() => $("#choose-topic-title").focus());
     }
   },
 
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.es6
index ddddfbdb30..6554a77cd1 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -102,7 +103,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   _hideCopyMessage() {
-    Ember.run.later(
+    later(
       () => this.setProperties({ successMessage: null, errorMessage: null }),
       2000
     );
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index d31fe00292..06ac89f3ad 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,4 +1,6 @@
 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 { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -133,7 +135,7 @@ export default Controller.extend(bufferedProperty("model"), {
       return;
     }
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       this.send("showHistory", post, revision);
     });
   },
@@ -1426,7 +1428,7 @@ export default Controller.extend(bufferedProperty("model"), {
         // automatically unpin topics when the user reaches the bottom
         const max = _.max(postNumbers);
         if (topic.get("pinned") && max >= topic.get("highest_post_number")) {
-          Ember.run.next(() => topic.clearPin());
+          next(() => topic.clearPin());
         }
       }
     }
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
index 21faedd650..f685d1b091 100644
--- a/app/assets/javascripts/discourse/initializers/asset-version.js.es6
+++ b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 //  Subscribe to "asset-version" change events via the Message Bus
 export default {
   name: "asset-version",
@@ -16,7 +17,7 @@ export default {
       if (!timeoutIsSet && Discourse.get("requiresRefresh")) {
         // Since we can do this transparently for people browsing the forum
         //  hold back the message 24 hours.
-        Ember.run.later(() => {
+        later(() => {
           bootbox.confirm(I18n.t("assets_changed_confirm"), function(result) {
             if (result) {
               document.location.reload();
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
index 83e0183ff3..31101d9010 100644
--- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 export default {
   name: "auth-complete",
   after: "inject-objects",
@@ -13,7 +14,7 @@ export default {
     if (lastAuthResult) {
       const router = container.lookup("router:main");
       router.one("didTransition", () => {
-        Ember.run.next(() =>
+        next(() =>
           Discourse.authenticationComplete(JSON.parse(lastAuthResult))
         );
       });
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6
index a536398e94..b0708fca85 100644
--- a/app/assets/javascripts/discourse/initializers/mobile.js.es6
+++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Mobile from "discourse/lib/mobile";
 import { setResolverOption } from "discourse-common/resolver";
 import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
@@ -17,7 +18,7 @@ export default {
     setResolverOption("mobileView", Mobile.mobileView);
 
     if (isAppWebview()) {
-      Ember.run.later(() => {
+      later(() => {
         postRNWebviewMessage(
           "headerBg",
           $(".d-header").css("background-color")
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js.es6
index cafa6e6f70..e2bb45ef08 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import pageVisible from "discourse/lib/page-visible";
 import logout from "discourse/lib/logout";
 
@@ -96,7 +97,7 @@ export function ajax() {
       handleRedirect(data);
       handleLogoff(xhr);
 
-      Ember.run(() => {
+      run(() => {
         Discourse.Site.currentProp(
           "isReadOnly",
           !!xhr.getResponseHeader("Discourse-Readonly")
@@ -107,7 +108,7 @@ export function ajax() {
         data = { result: data, xhr: xhr };
       }
 
-      Ember.run(null, resolve, data);
+      run(null, resolve, data);
     };
 
     args.error = (xhr, textStatus, errorThrown) => {
@@ -128,7 +129,7 @@ export function ajax() {
       xhr.jqTextStatus = textStatus;
       xhr.requestedUrl = url;
 
-      Ember.run(null, reject, {
+      run(null, reject, {
         jqXHR: xhr,
         textStatus: textStatus,
         errorThrown: errorThrown
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 18fc9a98e2..0bcb3331c8 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { later } from "@ember/runloop";
 /**
   This is a jQuery plugin to support autocompleting values in our text fields.
 
@@ -43,7 +45,7 @@ export default function(options) {
   if (this.length === 0) return;
 
   if (options === "destroy" || options.updateData) {
-    Ember.run.cancel(inputTimeout);
+    cancel(inputTimeout);
 
     $(this)
       .off("keyup.autocomplete")
@@ -402,7 +404,7 @@ export default function(options) {
   $(this).on("click.autocomplete", () => closeAutocomplete());
 
   $(this).on("paste.autocomplete", () => {
-    Ember.run.later(() => me.trigger("keydown"), 50);
+    later(() => me.trigger("keydown"), 50);
   });
 
   function checkTriggerRule(opts) {
@@ -455,8 +457,8 @@ export default function(options) {
     if (options.allowAny) {
       // saves us wiring up a change event as well
 
-      Ember.run.cancel(inputTimeout);
-      inputTimeout = Ember.run.later(function() {
+      cancel(inputTimeout);
+      inputTimeout = later(function() {
         if (inputSelectedItems.length === 0) {
           inputSelectedItems.push("");
         }
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
index 8d83f4d7f8..82cdb2d537 100644
--- a/app/assets/javascripts/discourse/lib/clean-dom.js.es6
+++ b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 function _clean() {
   if (window.MiniProfiler) {
     window.MiniProfiler.pageTransition();
@@ -35,5 +36,5 @@ function _clean() {
 }
 
 export function cleanDOM() {
-  Ember.run.scheduleOnce("afterRender", _clean);
+  scheduleOnce("afterRender", _clean);
 }
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index 42a65623a6..6e27ebbbe2 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
@@ -134,7 +135,7 @@ export default {
           $link.attr("href", null);
           $link.data("auto-route", true);
 
-          Ember.run.later(() => {
+          later(() => {
             $link.removeClass("no-href");
             $link.attr("href", $link.data("href"));
             $link.data("href", null);
diff --git a/app/assets/javascripts/discourse/lib/debounce.js.es6 b/app/assets/javascripts/discourse/lib/debounce.js.es6
index 6ab2eb1e58..f41b71f0d8 100644
--- a/app/assets/javascripts/discourse/lib/debounce.js.es6
+++ b/app/assets/javascripts/discourse/lib/debounce.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 /**
   Debounce a Javascript function. This means if it's called many times in a time limit it
   should only be executed once (at the end of the limit counted from the last call made).
@@ -13,6 +14,6 @@ export default function(func, wait) {
     self = this;
     args = arguments;
 
-    Ember.run.debounce(null, later, wait);
+    debounce(null, later, wait);
   };
 }
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 41b86bc30e..330772014d 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import KeyValueStore from "discourse/lib/key-value-store";
 import { formatUsername } from "discourse/lib/utilities";
@@ -79,7 +80,7 @@ function confirmNotification() {
   const clickEventHandler = () => notification.close();
 
   notification.addEventListener("click", clickEventHandler);
-  Ember.run.later(() => {
+  later(() => {
     notification.close();
     notification.removeEventListener("click", clickEventHandler);
   }, 10 * 1000);
@@ -177,7 +178,7 @@ function onNotification(data) {
     }
 
     notification.addEventListener("click", clickEventHandler);
-    Ember.run.later(() => {
+    later(() => {
       notification.close();
       notification.removeEventListener("click", clickEventHandler);
     }, 10 * 1000);
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index aa0b16efbb..991644737a 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,3 +1,5 @@
+import { run } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
@@ -140,7 +142,7 @@ export default {
   quoteReply() {
     this.sendToSelectedPost("replyToPost");
     // lazy but should work for now
-    Ember.run.later(() => $(".d-editor .quote").click(), 500);
+    later(() => $(".d-editor .quote").click(), 500);
 
     return false;
   },
@@ -210,7 +212,7 @@ export default {
   },
 
   showPageSearch(event) {
-    Ember.run(() => {
+    run(() => {
       this.appEvents.trigger("header:keyboard-trigger", {
         type: "page-search",
         event
@@ -219,7 +221,7 @@ export default {
   },
 
   printTopic(event) {
-    Ember.run(() => {
+    run(() => {
       if ($(".container.posts").length) {
         event.preventDefault(); // We need to stop printing the current page in Firefox
         this.container.lookup("controller:topic").print();
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
index d43b0f4a83..7179f234f1 100644
--- a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
 
@@ -7,7 +8,7 @@ const testedKey = "tested";
 const testedClass = `hashtag-${testedKey}`;
 
 function updateFound($hashtags, categorySlugs) {
-  Ember.run.schedule("afterRender", () => {
+  schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const categorySlug = categorySlugs[index];
       const link = validCategoryHashtags[categorySlug];
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 07f37388e4..68d0b8b5d6 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { formatUsername } from "discourse/lib/utilities";
@@ -39,7 +40,7 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  Ember.run.scheduleOnce("afterRender", function() {
+  scheduleOnce("afterRender", function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
index a0b2c95c46..5aa3f6d612 100644
--- a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
@@ -7,7 +8,7 @@ const checkedTagHashtags = [];
 const testedClass = "tag-hashtag-tested";
 
 function updateFound($hashtags, tagValues) {
-  Ember.run.schedule("afterRender", () => {
+  schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const tagValue = tagValues[index];
       const link = validTagHashtags[tagValue];
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 34b3f2897b..c1f11ec0f4 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 const _loaded = {};
 const _loading = {};
@@ -22,7 +23,7 @@ function loadWithTag(path, cb) {
     ) {
       s = s.onload = s.onreadystatechange = null;
       if (!abort) {
-        Ember.run(null, cb);
+        run(null, cb);
       }
     }
   };
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index d7577ed5ae..4acbdc4ea3 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 let _started = false;
 let cache = {};
 let transitionCount = 0;
@@ -31,7 +32,7 @@ export function startPageTracking(router, appEvents) {
 
     // Refreshing the title is debounced, so we need to trigger this in the
     // next runloop to have the correct title.
-    Ember.run.next(() => {
+    next(() => {
       let title = Discourse.get("_docTitle");
 
       appEvents.trigger("page:changed", {
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index e613ba16e3..5d5a10b0dc 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
 import {
   safariHacksDisabled,
@@ -94,7 +95,7 @@ function positioningWorkaround($fixedElement) {
 
       if (!iOSWithVisualViewport()) {
         fixedElement.style.height = oldHeight;
-        Ember.run.later(
+        later(
           () => $(fixedElement).removeClass("no-transition"),
           500
         );
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index a36b15cb21..314e1fac0a 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -1,3 +1,4 @@
+import { bind } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 
 // We use this class to track how long posts in a topic are on the screen.
@@ -26,7 +27,7 @@ export default class {
     // Create an interval timer if we don't have one.
     if (!this._interval) {
       this._interval = setInterval(() => this.tick(), 1000);
-      this._boundScrolled = Ember.run.bind(this, this.scrolled);
+      this._boundScrolled = bind(this, this.scrolled);
       $(window).on("scroll.screentrack", this._boundScrolled);
     }
 
diff --git a/app/assets/javascripts/discourse/lib/throttle.js.es6 b/app/assets/javascripts/discourse/lib/throttle.js.es6
index 2e8673203b..05daa36c5a 100644
--- a/app/assets/javascripts/discourse/lib/throttle.js.es6
+++ b/app/assets/javascripts/discourse/lib/throttle.js.es6
@@ -1,3 +1,4 @@
+import { throttle } from "@ember/runloop";
 /**
   Throttle a Javascript function. This means if it's called many times in a time limit it
   should only be executed one time at most during this time limit
@@ -13,6 +14,6 @@ export default function(func, spacing, immediate) {
     self = this;
     args = arguments;
 
-    Ember.run.throttle(null, later, spacing, immediate);
+    throttle(null, later, spacing, immediate);
   };
 }
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 085619f9e9..0dbb7aa3ce 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,4 +1,6 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
@@ -66,7 +68,7 @@ export function jumpToElement(elementId) {
 
   const selector = `#${elementId}, a[name=${elementId}]`;
   _jumpScheduled = true;
-  Ember.run.schedule("afterRender", function() {
+  schedule("afterRender", function() {
     const lockon = new LockOn(selector, {
       finished() {
         _jumpScheduled = false;
@@ -90,7 +92,7 @@ const DiscourseURL = EmberObject.extend({
 
     _transitioning = postNumber > 1;
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       let elementId;
       let holder;
 
@@ -156,7 +158,7 @@ const DiscourseURL = EmberObject.extend({
       // Always use replaceState in the next runloop to prevent weird routes changing
       // while URLs are loading. For example, while a topic loads it sets `currentPost`
       // which triggers a replaceState even though the topic hasn't fully loaded yet!
-      Ember.run.next(() => {
+      next(() => {
         const location = DiscourseURL.get("router.location");
         if (location && location.replaceURL) {
           location.replaceURL(path);
@@ -250,7 +252,7 @@ const DiscourseURL = EmberObject.extend({
     path = rewritePath(path);
 
     if (typeof opts.afterRouteComplete === "function") {
-      Ember.run.schedule("afterRender", opts.afterRouteComplete);
+      schedule("afterRender", opts.afterRouteComplete);
     }
 
     if (this.navigatedToPost(oldPath, path, opts)) {
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 212278f2e0..69bafea2fb 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,3 +1,6 @@
+import { throttle } from "@ember/runloop";
+import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
@@ -142,7 +145,7 @@ export default Ember.Mixin.create({
   _bindMobileScroll() {
     const mobileScrollEvent = this.mobileScrollEvent;
     const onScroll = () => {
-      Ember.run.throttle(this, this._close, 1000);
+      throttle(this, this._close, 1000);
     };
 
     $(window).on(mobileScrollEvent, onScroll);
@@ -171,7 +174,7 @@ export default Ember.Mixin.create({
 
     let verticalAdjustments = 0;
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       if (target) {
         if (!this.site.mobileView) {
           let position = target.offset();
@@ -245,7 +248,7 @@ export default Ember.Mixin.create({
         // note: we DO NOT use afterRender here cause _positionCard may
         // run afterwards, if we allowed this to happen the usercard
         // may be offscreen and we may scroll all the way to it on focus
-        Ember.run.next(null, () => {
+        next(null, () => {
           const firstLink = this.element.querySelector("a");
           firstLink && firstLink.focus();
         });
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js.es6
index 800898ae70..18a5ae5bf6 100644
--- a/app/assets/javascripts/discourse/mixins/docking.js.es6
+++ b/app/assets/javascripts/discourse/mixins/docking.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 const helper = {
   offset() {
     const mainOffset = $("#main").offset();
@@ -12,7 +13,7 @@ export default Ember.Mixin.create({
   init() {
     this._super(...arguments);
     this.queueDockCheck = () => {
-      Ember.run.debounce(this, this.safeDockCheck, 5);
+      debounce(this, this.safeDockCheck, 5);
     };
   },
 
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
index 0f27500a09..edd93096f0 100644
--- a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
+++ b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 // Small buffer so that very tiny scrolls don't trigger mobile header switch
 const MOBILE_SCROLL_TOLERANCE = 5;
 
@@ -42,7 +43,7 @@ export default Ember.Mixin.create({
     // If the user reaches the very bottom of the topic, we only want to reset
     // this scroll direction after a second scrolldown. This is a nicer event
     // similar to what Safari and Chrome do.
-    Ember.run.debounce(() => {
+    debounce(() => {
       this._bottomHit = 1;
     }, 1000);
 
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index 630227b8fa..f666e9be5a 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import { deprecated } from "discourse/mixins/scroll-top";
 
@@ -14,7 +15,7 @@ function scrollTop() {
   if (DiscourseURL.isJumpScheduled()) {
     return;
   }
-  Ember.run.scheduleOnce("afterRender", context, context._scrollTop);
+  scheduleOnce("afterRender", context, context._scrollTop);
 }
 
 export default Ember.Mixin.create({
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index 690bf1168f..f51474c0b2 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
 
 /**
@@ -37,7 +38,7 @@ const Scrolling = Ember.Mixin.create({
       if (router.activeTransition) {
         return;
       }
-      return Ember.run.scheduleOnce("afterRender", this, "scrolled");
+      return scheduleOnce("afterRender", this, "scrolled");
     };
 
     if (opts.debounce) {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 4d851e6e3a..3a265ab342 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,4 +1,7 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
@@ -994,7 +997,7 @@ const Composer = RestModel.extend({
               post.set("reply_count", post.reply_count - 1);
             }
           }
-          Ember.run.next(() => composer.set("composeState", OPEN));
+          next(() => composer.set("composeState", OPEN));
         })
       );
   },
@@ -1045,7 +1048,7 @@ const Composer = RestModel.extend({
     });
 
     if (this._clearingStatus) {
-      Ember.run.cancel(this._clearingStatus);
+      cancel(this._clearingStatus);
       this._clearingStatus = null;
     }
 
@@ -1085,7 +1088,7 @@ const Composer = RestModel.extend({
     const draftStatus = this.draftStatus;
 
     if (draftStatus && !this._clearingStatus) {
-      this._clearingStatus = Ember.run.later(
+      this._clearingStatus = later(
         this,
         () => {
           this.setProperties({ draftStatus: null, draftConflictUser: null });
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 4130d7ffe6..cb1e5f0406 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,3 +1,5 @@
+import { once } from "@ember/runloop";
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
@@ -56,7 +58,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     // Ember doesn't provider a router `willTransition` event so let's make one
     willTransition() {
       var router = getOwner(this).lookup("router:main");
-      Ember.run.once(router, router.trigger, "willTransition");
+      once(router, router.trigger, "willTransition");
       return this._super(...arguments);
     },
 
@@ -226,7 +228,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
   activate() {
     this._super(...arguments);
-    Ember.run.next(function() {
+    next(function() {
       // Support for callbacks once the application has activated
       ApplicationRoute.trigger("activate");
     });
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js.es6
index 7cbfee6754..a182e85c88 100644
--- a/app/assets/javascripts/discourse/routes/associate-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/associate-account.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
@@ -7,7 +8,7 @@ export default DiscourseRoute.extend({
   beforeModel() {
     const params = this.paramsFor("associate-account");
     this.replaceWith(`preferences.account`, this.currentUser).then(() =>
-      Ember.run.next(() =>
+      next(() =>
         ajax(`/associate/${encodeURIComponent(params.token)}.json`)
           .then(model => showModal("associate-account-confirm", { model }))
           .catch(popupAjaxError)
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index fb828bddd1..2329168593 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,3 +1,4 @@
+import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
@@ -55,7 +56,7 @@ const DiscourseRoute = Route.extend({
     },
 
     refreshTitle() {
-      Ember.run.once(this, this._refreshTitleOnce);
+      once(this, this._refreshTitleOnce);
     },
 
     clearTopicDraft() {
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 19543ae481..1510856c11 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
@@ -134,7 +135,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     didTransition() {
-      Ember.run.next(() =>
+      next(() =>
         this.controllerFor("application").set("showFooter", true)
       );
       return true;
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
index e88fbdb082..58309565b5 100644
--- a/app/assets/javascripts/discourse/routes/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { defaultHomepage } from "discourse/lib/utilities";
 import buildStaticRoute from "discourse/routes/build-static-route";
 
@@ -11,7 +12,7 @@ ForgotPasswordRoute.reopen({
     this.replaceWith(
       loginRequired ? "login" : `discovery.${defaultHomepage()}`
     ).then(e => {
-      Ember.run.next(() => e.send("showForgotPassword"));
+      next(() => e.send("showForgotPassword"));
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js.es6
index 8465ceb6bc..c41f884f30 100644
--- a/app/assets/javascripts/discourse/routes/login.js.es6
+++ b/app/assets/javascripts/discourse/routes/login.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 import { defaultHomepage } from "discourse/lib/utilities";
 
@@ -7,7 +8,7 @@ LoginRoute.reopen({
   beforeModel() {
     if (!this.siteSettings.login_required) {
       this.replaceWith(`/${defaultHomepage()}`).then(e => {
-        Ember.run.next(() => e.send("showLogin"));
+        next(() => e.send("showLogin"));
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 1410c65356..c85001cbbf 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
@@ -15,7 +16,7 @@ export default DiscourseRoute.extend({
           User.findByUsername(encodeURIComponent(params.username))
             .then(user => {
               if (user.can_send_private_message_to_user) {
-                Ember.run.next(() =>
+                next(() =>
                   e.send(
                     "createNewMessageViaParams",
                     user.username,
@@ -35,7 +36,7 @@ export default DiscourseRoute.extend({
           Group.messageable(groupName)
             .then(result => {
               if (result.messageable) {
-                Ember.run.next(() =>
+                next(() =>
                   e.send(
                     "createNewMessageViaParams",
                     groupName,
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js.es6
index 82b2b496ef..550b4b5341 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
 
@@ -63,7 +64,7 @@ export default DiscourseRoute.extend({
   },
 
   _sendTransition(event, transition, categoryId) {
-    Ember.run.next(() => {
+    next(() => {
       event.send(
         "createNewTopicViaParams",
         transition.to.queryParams.title,
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js.es6
index a2753ded2b..9a732c67d8 100644
--- a/app/assets/javascripts/discourse/routes/signup.js.es6
+++ b/app/assets/javascripts/discourse/routes/signup.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 
 const SignupRoute = buildStaticRoute("signup");
@@ -9,13 +10,13 @@ SignupRoute.reopen({
     if (!this.siteSettings.login_required) {
       this.replaceWith("discovery.latest").then(e => {
         if (canSignUp) {
-          Ember.run.next(() => e.send("showCreateAccount"));
+          next(() => e.send("showCreateAccount"));
         }
       });
     } else {
       this.replaceWith("login").then(e => {
         if (canSignUp) {
-          Ember.run.next(() => e.send("showCreateAccount"));
+          next(() => e.send("showCreateAccount"));
         }
       });
     }
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index c3d0e6cf72..6f626644a4 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
@@ -57,7 +58,7 @@ export default DiscourseRoute.extend({
         topicController.subscribe();
 
         // Highlight our post after the next render
-        Ember.run.scheduleOnce("afterRender", () =>
+        scheduleOnce("afterRender", () =>
           this.appEvents.trigger("post:highlight", closest)
         );
 
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index e4b168ec7a..f992c01c5b 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,3 +1,6 @@
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
@@ -168,9 +171,9 @@ const TopicRoute = DiscourseRoute.extend({
           postUrl += "/" + currentPost;
         }
 
-        Ember.run.cancel(scheduledReplace);
+        cancel(scheduledReplace);
         lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = Ember.run.later(
+        scheduledReplace = later(
           this,
           "_replaceUnlessScrolling",
           postUrl,
@@ -186,7 +189,7 @@ const TopicRoute = DiscourseRoute.extend({
 
     willTransition() {
       this._super(...arguments);
-      Ember.run.cancel(scheduledReplace);
+      cancel(scheduledReplace);
       isTransitioning = true;
       return true;
     }
@@ -201,7 +204,7 @@ const TopicRoute = DiscourseRoute.extend({
       return;
     }
     lastScrollPos = currentPos;
-    scheduledReplace = Ember.run.later(
+    scheduledReplace = later(
       this,
       "_replaceUnlessScrolling",
       url,
@@ -302,7 +305,7 @@ const TopicRoute = DiscourseRoute.extend({
     // We reset screen tracking every time a topic is entered
     this.screenTrack.start(model.get("id"), controller);
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       this.appEvents.trigger("header:update-topic", model);
     });
   }
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index 44add9ca7e..44eabe7c03 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 export default class ComponentConnector {
   constructor(widget, componentName, opts, trackedProperties) {
     this.widget = widget;
@@ -13,7 +14,7 @@ export default class ComponentConnector {
     const elem = $elem[0];
     const { opts, widget, componentName } = this;
 
-    Ember.run.next(() => {
+    next(() => {
       const mounted = widget._findView();
 
       const view = widget.register
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index b077bde0eb..d5d1c98f3d 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import deprecated from "discourse-common/lib/deprecated";
 
 export default class Connector {
@@ -11,7 +12,7 @@ export default class Connector {
     const elem = $elem[0];
 
     const { opts, widget } = this;
-    Ember.run.next(() => {
+    next(() => {
       const mounted = widget._findView();
 
       if (opts.templateName) {
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 97fcbd3fe5..c3a6af4b80 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import { diff, patch } from "virtual-dom";
 import { queryRegistry } from "discourse/widgets/widget";
 import DirtyKeys from "discourse/lib/dirty-keys";
@@ -25,11 +27,11 @@ export default class WidgetGlue {
   }
 
   queueRerender() {
-    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
+    this._timeout = scheduleOnce("render", this, this.rerenderWidget);
   }
 
   rerenderWidget() {
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
 
     // in test mode return early if store cannot be found
     if (Ember.testing) {
@@ -51,6 +53,6 @@ export default class WidgetGlue {
   }
 
   cleanUp() {
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
   }
 }
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 4b25906350..b11689796a 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import DiscourseURL from "discourse/lib/url";
@@ -342,7 +343,7 @@ export default createWidget("hamburger-menu", {
       const $headerCloak = $(".header-cloak");
       $headerCloak.addClass("animate");
       $headerCloak.css("opacity", 0);
-      Ember.run.later(() => this.sendWidgetAction("toggleHamburger"), 200);
+      later(() => this.sendWidgetAction("toggleHamburger"), 200);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 0d1d30cc9a..02fd704dca 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { avatarImg } from "discourse/widgets/post";
@@ -419,7 +420,7 @@ export default createWidget("header", {
     this.updateHighlight();
 
     if (this.state.searchVisible) {
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         const $searchInput = $("#search-term");
         $searchInput.focus().select();
 
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index c44035f76c..3c70593130 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,3 +1,5 @@
+import { run } from "@ember/runloop";
+import { next } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
@@ -7,7 +9,7 @@ const LIKE_ACTION = 2;
 
 function animateHeart($elem, start, end, complete) {
   if (Ember.testing) {
-    return Ember.run(this, complete);
+    return run(this, complete);
   }
 
   $elem
@@ -411,7 +413,7 @@ export default createWidget("post-menu", {
       const likedPostId = keyValueStore.getInt("likedPostId");
       if (likedPostId === attrs.id) {
         keyValueStore.remove("likedPostId");
-        Ember.run.next(() => this.sendWidgetAction("toggleLike"));
+        next(() => this.sendWidgetAction("toggleLike"));
       }
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
index 9291d8a4e6..6406d1c9e8 100644
--- a/app/assets/javascripts/discourse/widgets/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import transformPost from "discourse/lib/transform-post";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -39,7 +40,7 @@ export function cloak(post, component) {
   _heights[post.id] = $post.outerHeight();
 
   component.dirtyKeys.keyDirty(`post-${post.id}`);
-  Ember.run.debounce(component, "queueRerender", 1000);
+  debounce(component, "queueRerender", 1000);
 }
 
 export function uncloak(post, component) {
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 808f3282c3..1bd428a835 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -30,7 +32,7 @@ const SearchHelper = {
     }
 
     this._cancelSearch = true;
-    Ember.run.later(() => (this._cancelSearch = false), 400);
+    later(() => (this._cancelSearch = false), 400);
   },
 
   perform(widget) {
@@ -285,7 +287,7 @@ export default createWidget("search-menu", {
     searchData.noResults = false;
     this.searchService().set("highlightTerm", searchData.term);
     searchData.loading = true;
-    Ember.run.debounce(SearchHelper, SearchHelper.perform, this, 400);
+    debounce(SearchHelper, SearchHelper.perform, this, 400);
   },
 
   moreOfType(type) {
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index eac0ac7b5c..813a390ec5 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import ComponentConnector from "discourse/widgets/component-connector";
 import { h } from "virtual-dom";
@@ -400,7 +401,7 @@ export default createWidget("topic-timeline", {
     const stream = this.attrs.topic.get("postStream");
 
     // a little debounce to avoid flashing
-    Ember.run.later(() => {
+    later(() => {
       if (!this.state.position === scrollPosition) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index 96e56fb7ac..cf669d1edc 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { formatUsername } from "discourse/lib/utilities";
@@ -227,7 +228,7 @@ export default createWidget("user-menu", {
       const $headerCloak = $(".header-cloak");
       $headerCloak.addClass("animate");
       $headerCloak.css("opacity", 0);
-      Ember.run.later(() => this.sendWidgetAction("toggleUserMenu"), 200);
+      later(() => this.sendWidgetAction("toggleUserMenu"), 200);
     }
   },
 
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index 4753ec8015..a500274a77 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 let timeout;
 const loadingQueue = [];
 let localCache = {};
@@ -82,7 +83,7 @@ function loadNext(ajax) {
       }
     )
     .finally(() => {
-      timeout = Ember.run.later(() => loadNext(ajax), timeoutMs);
+      timeout = later(() => loadNext(ajax), timeoutMs);
       if (removeLoading) {
         $elem.removeClass(LOADING_ONEBOX_CSS_CLASS);
         $elem.data("onebox-loaded");
@@ -129,7 +130,7 @@ export function load({
   if (synchronous) {
     return loadNext(ajax);
   } else {
-    timeout = timeout || Ember.run.later(() => loadNext(ajax), 150);
+    timeout = timeout || later(() => loadNext(ajax), 150);
   }
 }
 
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
index 8b0b4db2b4..3a2f46805c 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 let _cache = {};
 
 export function lookupCachedUploadUrl(shortUrl) {
@@ -100,7 +101,7 @@ export function resolveAllShortUrls(ajax) {
     $shortUploadUrls = $(attributes);
     if ($shortUploadUrls.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
-      return Ember.run.debounce(
+      return debounce(
         null,
         () => _loadShortUrls($shortUploadUrls, ajax),
         450,
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index b086aa2e43..62522d9edd 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -1,3 +1,5 @@
+import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Mixin.create({
@@ -92,8 +94,8 @@ export default Ember.Mixin.create({
   focusFilterOrHeader() {
     const context = this;
     // next so we are sure it finised expand/collapse
-    Ember.run.next(() => {
-      Ember.run.schedule("afterRender", () => {
+    next(() => {
+      schedule("afterRender", () => {
         if (
           !context.$filterInput() ||
           !context.$filterInput().is(":visible") ||
@@ -129,9 +131,9 @@ export default Ember.Mixin.create({
     this.focusFilterOrHeader();
     this.autoHighlight();
 
-    Ember.run.next(() => {
+    next(() => {
       this._boundaryActionHandler("onExpand", this);
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         if (!this.isDestroying && !this.isDestroyed) {
           this._adjustPosition();
         }
@@ -144,9 +146,9 @@ export default Ember.Mixin.create({
 
     this.set("isExpanded", false);
 
-    Ember.run.next(() => {
+    next(() => {
       this._boundaryActionHandler("onCollapse", this);
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         if (!this.isDestroying && !this.isDestroyed) {
           this._removeFixedPosition();
         }
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 0cbdf5da67..f985da1616 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,3 +1,5 @@
+import { throttle } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 
 const { bind } = Ember.run;
@@ -138,7 +140,7 @@ export default Ember.Mixin.create({
       this.set("renderedFilterOnce", true);
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.$filterInput()
         .focus()
         .val(this.$filterInput().val() + String.fromCharCode(keyCode));
@@ -267,7 +269,7 @@ export default Ember.Mixin.create({
 
     const direction = keyCode === 38 ? -1 : 1;
 
-    Ember.run.throttle(this, this._moveHighlight, direction, $rows, 32);
+    throttle(this, this._moveHighlight, direction, $rows, 32);
   },
 
   didPressBackspaceFromFilter(event) {
@@ -428,7 +430,7 @@ export default Ember.Mixin.create({
   },
 
   _highlightRow($row) {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $row.trigger("mouseover").focus();
       this.focus();
     });
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index e8b25973a6..de04d70bab 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 
 export default Component.extend({
@@ -60,7 +61,7 @@ export default Component.extend({
       this.updateField();
 
       this.set("inviteEmail", "");
-      Ember.run.scheduleOnce("afterRender", () =>
+      scheduleOnce("afterRender", () =>
         this.element.querySelector(".invite-email").focus()
       );
     },
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index b40d9839f1..e7ceaa898f 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes, on } from "ember-addons/ember-computed-decorators";
 
@@ -13,7 +14,7 @@ export default Component.extend({
   @on("init")
   updateVal() {
     const checked = this.value === this.radioValue;
-    Ember.run.next(
+    next(
       () => (this.element.querySelector("input[type=radio]").checked = checked)
     );
   }
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index c938d1e167..1d034d1c47 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import {
@@ -92,7 +93,7 @@ export default Component.extend({
   },
 
   autoFocus() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       const $invalid = $(".wizard-field.invalid:eq(0) .wizard-focusable");
 
       if ($invalid.length) {
@@ -104,7 +105,7 @@ export default Component.extend({
   },
 
   animateInvalidFields() {
-    Ember.run.scheduleOnce("afterRender", () =>
+    scheduleOnce("afterRender", () =>
       $(".invalid input[type=text], .invalid textarea").wiggle(2, 100)
     );
   },
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js.es6
index 9112c3787f..64cc9571cc 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js.es6
+++ b/app/assets/javascripts/wizard/lib/ajax.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import getUrl from "discourse-common/lib/get-url";
 import jQuery from "jquery";
 
@@ -14,8 +15,8 @@ export function getToken() {
 export function ajax(args) {
   return new Ember.RSVP.Promise((resolve, reject) => {
     args.headers = { "X-CSRF-Token": getToken() };
-    args.success = data => Ember.run(null, resolve, data);
-    args.error = xhr => Ember.run(null, reject, xhr);
+    args.success = data => run(null, resolve, data);
+    args.error = xhr => run(null, reject, xhr);
     args.url = getUrl(args.url);
     jQuery.ajax(args);
   });
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6
index 0ee5a35b27..d597bfae53 100644
--- a/app/assets/javascripts/wizard/lib/preview.js.es6
+++ b/app/assets/javascripts/wizard/lib/preview.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 /*eslint no-bitwise:0 */
 import getUrl from "discourse-common/lib/get-url";
@@ -72,7 +73,7 @@ export function createPreviewComponent(width, height, obj) {
       },
 
       triggerRepaint() {
-        Ember.run.scheduleOnce("afterRender", this, "repaint");
+        scheduleOnce("afterRender", this, "repaint");
       },
 
       repaint() {
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
index 1a4177542a..70a7e67fc0 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import startApp from "wizard/test/helpers/start-app";
 
 var wizard;
@@ -7,7 +8,7 @@ QUnit.module("Acceptance: wizard", {
   },
 
   afterEach() {
-    Ember.run(wizard, "destroy");
+    run(wizard, "destroy");
   }
 });
 
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
index 233869bb1a..d82b237c35 100644
--- a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import Wizard from "wizard/wizard";
 import initializer from "wizard/initializers/load-helpers";
 
@@ -5,7 +6,7 @@ let app;
 let started = false;
 
 export default function() {
-  Ember.run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
+  run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
 
   if (!started) {
     initializer.initialize(app);
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 6b2f7776f0..76e3d64088 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,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
@@ -55,7 +56,7 @@ export default Component.extend({
     if (markup) {
       cookAsync(markup).then(result => {
         this.set("currentPreview", result);
-        Ember.run.schedule("afterRender", () =>
+        schedule("afterRender", () =>
           this.$(".preview .discourse-local-date").applyLocalDates()
         );
       });
@@ -409,7 +410,7 @@ export default Component.extend({
       date = null;
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this._picker.setMinDate(moment(date, this.dateFormat).toDate());
     });
   },
@@ -419,7 +420,7 @@ export default Component.extend({
       date = null;
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this._picker.setDate(moment.utc(date), true);
     });
   },
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 c6818bb2ce..2e6521008e 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,3 +1,6 @@
+import { once } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -26,12 +29,12 @@ export default Component.extend({
   @on("didInsertElement")
   composerOpened() {
     this._lastPublish = new Date();
-    Ember.run.once(this, "updateState");
+    once(this, "updateState");
   },
 
   @observes("action", "post.id", "topic.id")
   composerStateChanged() {
-    Ember.run.once(this, "updateState");
+    once(this, "updateState");
   },
 
   @observes("reply", "title")
@@ -44,8 +47,8 @@ export default Component.extend({
   @on("willDestroyElement")
   composerClosing() {
     this.publish({ previous: this.currentState });
-    Ember.run.cancel(this._pingTimer);
-    Ember.run.cancel(this._clearTimer);
+    cancel(this._pingTimer);
+    cancel(this._clearTimer);
   },
 
   updateState() {
@@ -94,7 +97,7 @@ export default Component.extend({
         r.messagebus_channel,
         message => {
           if (!this.isDestroyed) this.set("presenceUsers", message.users);
-          this._clearTimer = Ember.run.debounce(
+          this._clearTimer = debounce(
             this,
             "clear",
             keepAliveDuration + bufferTime
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 e6861cdf6b..37abc00f30 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,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -26,7 +28,7 @@ export default Component.extend({
       this.channel,
       message => {
         if (!this.isDestroyed) this.set("presenceUsers", message.users);
-        this._clearTimer = Ember.run.debounce(
+        this._clearTimer = debounce(
           this,
           "clear",
           keepAliveDuration + bufferTime
@@ -38,7 +40,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   _destroyed() {
-    Ember.run.cancel(this._clearTimer);
+    cancel(this._clearTimer);
     this.messageBus.unsubscribe(this.channel);
   },
 
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 262146ab3d..39573aa31b 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
@@ -84,7 +85,7 @@ QUnit.test("Tests the Composer controls", async assert => {
   event[mac ? "metaKey" : "ctrlKey"] = true;
   event.keyCode = 66;
 
-  Ember.run(() => textarea.dispatchEvent(event));
+  run(() => textarea.dispatchEvent(event));
 
   const example = I18n.t(`composer.bold_text`);
   assert.equal(
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 45a7114672..13725f4d6c 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import { acceptance, controllerFor } from "helpers/qunit-helpers";
 import showModal from "discourse/lib/show-modal";
 
@@ -37,7 +38,7 @@ QUnit.test("modal", async function(assert) {
     '{{#d-modal-body title="" class="" dismissable=false}}test{{/d-modal-body}}'
   );
 
-  Ember.run(() => showModal("not-dismissable", {}));
+  run(() => showModal("not-dismissable", {}));
 
   assert.ok(find(".d-modal:visible").length === 1, "modal should appear");
 
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index cb008f0323..8c6d936e89 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import componentTest from "helpers/component-test";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import formatTextWithSelection from "helpers/d-editor-helper";
@@ -747,7 +748,7 @@ composerTestCase("replace-text event for composer", async function(assert) {
         .lookup("service:app-events")
         .trigger("composer:replace-text", "green", "yellow", { forceFocus: true });
 
-      Ember.run.next(() => {
+      next(() => {
         let expect = formatTextWithSelection(AFTER, CASE.after);
         let actual = formatTextWithSelection(
           this.value,
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index f12da98666..695a204291 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
 import Topic from "discourse/models/topic";
 import PostStream from "discourse/models/post-stream";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -545,7 +546,7 @@ QUnit.test(
     const done = assert.async();
     controller.send("deletePost", post);
 
-    Ember.run.next(() => {
+    next(() => {
       assert.ok(destroyed, "post was destroyed");
       done();
     });
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 5e79f87647..ca1bd8363a 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,3 +1,5 @@
+import { run } from "@ember/runloop";
+import { later } from "@ember/runloop";
 /* global QUnit, resetSite */
 
 import sessionFixtures from "fixtures/session-fixtures";
@@ -155,7 +157,7 @@ export function controllerFor(controller, model) {
 export function asyncTestDiscourse(text, func) {
   QUnit.test(text, function(assert) {
     const done = assert.async();
-    Ember.run(() => {
+    run(() => {
       func.call(this, assert);
       done();
     });
@@ -206,7 +208,7 @@ export function waitFor(assert, callback, timeout) {
   timeout = timeout || 500;
 
   const done = assert.async();
-  Ember.run.later(() => {
+  later(() => {
     callback();
     done();
   }, timeout);
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index d64823cd2a..a40e803bd2 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "helpers/qunit-helpers";
@@ -173,7 +174,7 @@ QUnit.skip("restores the href after a while", async assert => {
   assert.timeout(75);
 
   const done = assert.async();
-  Ember.run.later(() => {
+  later(() => {
     assert.equal(fixture("a").attr("href"), "http://www.google.com");
     done();
   });
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js.es6
index 115417e4d4..429b669d7c 100644
--- a/test/javascripts/models/nav-item-test.js.es6
+++ b/test/javascripts/models/nav-item-test.js.es6
@@ -1,8 +1,9 @@
+import { run } from "@ember/runloop";
 import createStore from "helpers/create-store";
 
 QUnit.module("Discourse.NavItem", {
   beforeEach() {
-    Ember.run(function() {
+    run(function() {
       const asianCategory = Discourse.Category.create({
         name: "确实是这样",
         id: 343434
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6
index fcb35f96b9..4666285c27 100644
--- a/test/javascripts/widgets/widget-test.js.es6
+++ b/test/javascripts/widgets/widget-test.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 import { createWidget } from "discourse/widgets/widget";
 import { withPluginApi } from "discourse/lib/plugin-api";
@@ -159,7 +160,7 @@ widgetTest("widget update with promise", {
 
       click() {
         return new Ember.RSVP.Promise(resolve => {
-          Ember.run.next(() => {
+          next(() => {
             this.state.name = "Robin";
             resolve();
           });

From e5525d03b857dacb7aa2d4540f5c8d52d2da9158 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 16:14:46 -0400
Subject: [PATCH 222/328] FIX: Yet more linting fixes

---
 .../javascripts/admin/components/resumable-upload.js.es6  | 4 +---
 .../discourse/components/choose-message.js.es6            | 4 +---
 .../discourse/components/composer-editor.js.es6           | 8 +-------
 .../javascripts/discourse/components/d-editor.js.es6      | 5 +----
 .../discourse/components/discovery-topics-list.js.es6     | 4 +---
 .../javascripts/discourse/components/global-notice.js.es6 | 5 +----
 .../discourse/components/pwa-install-banner.js.es6        | 5 +----
 .../discourse/components/scrolling-post-stream.js.es6     | 3 +--
 .../javascripts/discourse/components/signup-cta.js.es6    | 5 +----
 .../javascripts/discourse/components/topic-list.js.es6    | 4 +---
 .../discourse/components/topic-progress.js.es6            | 7 +------
 .../discourse/components/topic-timer-info.js.es6          | 6 +-----
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6  | 5 +----
 .../discourse/routes/discovery-categories.js.es6          | 4 +---
 14 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 344e76deb6..d63a1a651d 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -52,9 +52,7 @@ export default Component.extend(
 
       this.resumable.on("fileProgress", file => {
         // update progress
-        later(() =>
-          this.set("progress", parseInt(file.progress() * 100, 10))
-        );
+        later(() => this.set("progress", parseInt(file.progress() * 100, 10)));
       });
 
       this.resumable.on("fileSuccess", file => {
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index c6dd177fe9..be174ad685 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -58,9 +58,7 @@ export default Component.extend({
     chooseMessage(message) {
       const messageId = Ember.get(message, "id");
       this.set("selectedTopicId", messageId);
-      next(() =>
-        $(`#choose-message-${messageId}`).prop("checked", "true")
-      );
+      next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index c9ccf82fa6..8042d248da 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -197,13 +197,7 @@ export default Component.extend({
       this._initInputPreviewSync($input, $preview);
     } else {
       $input.on("scroll", () =>
-        throttle(
-          this,
-          this._syncEditorAndPreviewScroll,
-          $input,
-          $preview,
-          20
-        )
+        throttle(this, this._syncEditorAndPreviewScroll, $input, $preview, 20)
       );
     }
 
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 4b95ddc814..e839fad6c6 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -444,10 +444,7 @@ export default Component.extend({
             if (filterInput) {
               filterInput.value = v.term;
 
-              later(
-                () => filterInput.dispatchEvent(new Event("input")),
-                50
-              );
+              later(() => filterInput.dispatchEvent(new Event("input")), 50);
             }
           });
 
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 9c6cb779c2..6706cacd4a 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -14,9 +14,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
   _readjustScrollPosition() {
     const scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      schedule("afterRender", () =>
-        $(window).scrollTop(scrollTo + 1)
-      );
+      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
     } else {
       scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
     }
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 571d895f84..1b288f5429 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -92,10 +92,7 @@ export default Component.extend(
       this._boundRerenderBuffer = bind(this, this.rerenderBuffer);
       LogsNotice.current().addObserver("hidden", this._boundRerenderBuffer);
 
-      this._boundResetCurrentProp = bind(
-        this,
-        this._resetCurrentProp
-      );
+      this._boundResetCurrentProp = bind(this, this._resetCurrentProp);
       $(this.element).on(
         "click.global-notice",
         ".alert-logs-notice .close",
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
index a82f76518b..e2e60f3d88 100644
--- a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
@@ -19,10 +19,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _registerListener() {
-    this._promptEventHandler = bind(
-      this,
-      this._handleInstallPromptEvent
-    );
+    this._promptEventHandler = bind(this, this._handleInstallPromptEvent);
     window.addEventListener("beforeinstallprompt", this._promptEventHandler);
   },
 
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 38f6536b9d..04f0897eb6 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -314,8 +314,7 @@ export default MountWidget.extend({
 
   didInsertElement() {
     this._super(...arguments);
-    const debouncedScroll = () =>
-      debounce(this, this._scrollTriggered, 10);
+    const debouncedScroll = () => debounce(this, this._scrollTriggered, 10);
 
     this._previouslyNearby = {};
 
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index 92df1a672f..49536eff37 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -11,10 +11,7 @@ export default Component.extend({
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
-      later(
-        () => this.session.set("showSignupCta", false),
-        20 * 1000
-      );
+      later(() => this.session.set("showSignupCta", false), 20 * 1000);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 44f4a39a69..870c68f9c8 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -70,9 +70,7 @@ export default Component.extend(LoadMore, {
 
     let scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      schedule("afterRender", () =>
-        $(window).scrollTop(scrollTo + 1)
-      );
+      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 9e3388ca9b..19ec394b03 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -101,12 +101,7 @@ export default Component.extend({
 
     const prevEvent = this.prevEvent;
     if (prevEvent) {
-      scheduleOnce(
-        "afterRender",
-        this,
-        this._topicScrolled,
-        prevEvent
-      );
+      scheduleOnce("afterRender", this, this._topicScrolled, prevEvent);
     } else {
       scheduleOnce("afterRender", this, this._updateProgressBar);
     }
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 2210a3b47c..bb26e0caba 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -87,11 +87,7 @@ export default Component.extend(
 
         // TODO Sam: concerned this can cause a heavy rerender loop
         if (!Ember.testing) {
-          this._delayedRerender = later(
-            this,
-            this.rerender,
-            rerenderDelay
-          );
+          this._delayedRerender = later(this, this.rerender, rerenderDelay);
         }
       }
     },
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 5d5a10b0dc..ac64d26461 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -95,10 +95,7 @@ function positioningWorkaround($fixedElement) {
 
       if (!iOSWithVisualViewport()) {
         fixedElement.style.height = oldHeight;
-        later(
-          () => $(fixedElement).removeClass("no-transition"),
-          500
-        );
+        later(() => $(fixedElement).removeClass("no-transition"), 500);
       }
 
       $(window).scrollTop(originalScrollTop);
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 1510856c11..125b6bf9d0 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -135,9 +135,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     didTransition() {
-      next(() =>
-        this.controllerFor("application").set("showFooter", true)
-      );
+      next(() => this.controllerFor("application").set("showFooter", true));
       return true;
     }
   }

From 249dff85c766f30dd42bd6ae840b03e113a894b8 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 16:25:37 -0400
Subject: [PATCH 223/328] FIX: Use modules for `Ember.run.debounce` hack in
 testing

---
 app/assets/javascripts/discourse-loader.js | 2 +-
 test/javascripts/test_helper.js            | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 52ad20808c..878f16e471 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -17,7 +17,7 @@ var define, requirejs;
       "@ember/runloop": {
         bind: Ember.run.bind,
         cancel: Ember.run.cancel,
-        debounce: Ember.run.debounce,
+        debounce: Ember.testing ? Ember.run : Ember.run.debounce,
         later: Ember.run.later,
         next: Ember.run.next,
         once: Ember.run.once,
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5795795dc0..1f1f15a0d4 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -73,8 +73,7 @@ if (window.Logster) {
   window.Logster = { enabled: false };
 }
 
-var origDebounce = Ember.run.debounce,
-  pretender = require("helpers/create-pretender", null, null, false),
+var pretender = require("helpers/create-pretender", null, null, false),
   fixtures = require("fixtures/site-fixtures", null, null, false).default,
   flushMap = require("discourse/models/store", null, null, false).flushMap,
   ScrollingDOMMethods = require("discourse/mixins/scrolling", null, null, false)
@@ -137,15 +136,9 @@ QUnit.testStart(function(ctx) {
 
   // Unless we ever need to test this, let's leave it off.
   $.fn.autocomplete = function() {};
-
-  // Don't debounce in test unless we're testing debouncing
-  if (ctx.module.indexOf("debounce") === -1) {
-    Ember.run.debounce = Ember.run;
-  }
 });
 
 QUnit.testDone(function() {
-  Ember.run.debounce = origDebounce;
   window.sandbox.restore();
 
   // Destroy any modals

From cfa5d123a3a4d5d58df0c411b665a367a014999b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 16:45:05 -0400
Subject: [PATCH 224/328] Temporary fix: Don't use ember imports in pretty text

---
 app/assets/javascripts/discourse-loader.js | 6 ++++++
 lib/pretty_text.rb                         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 878f16e471..68128b1f6a 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -31,6 +31,12 @@ var define, requirejs;
         inject: Ember.inject.service
       }
     };
+  } else if (typeof __PRETTY_TEXT !== "undefined") {
+    // This is a hack because our server side code includes the pretty_text bundle
+    // which relies on ember now that we're using modules properly.
+    // The proper fix would be to move the upload urls code out of the pretty text
+    // bundle and remove this code. It should never be called;
+    EMBER_MODULES["@ember/runloop"] = {};
   }
 
   var _isArray;
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d620320f1b..8be1397497 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -73,6 +73,7 @@ module PrettyText
       ctx.attach("console.log", proc { |l| p l })
       ctx.eval('window.console = console;')
     end
+    ctx.eval("__PRETTY_TEXT = true")
 
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")

From fcb1ca52f96bdff1a49d558a4ffb18107d8334de Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 29 Oct 2019 17:10:47 -0400
Subject: [PATCH 225/328] Revert Ember.run refactors

This reverts commit 5ca60fcb6b592524086f98279d3e4fd949598343.
---
 .../components/admin-backups-logs.js.es6      |  3 +-
 .../components/admin-report-chart.js.es6      |  8 ++--
 .../admin-report-stacked-chart.js.es6         |  8 ++--
 .../admin/components/admin-report.js.es6      |  3 +-
 .../components/admin-theme-editor.js.es6      |  3 +-
 .../components/admin-user-field-item.js.es6   |  3 +-
 .../admin/components/color-input.js.es6       |  5 +--
 .../admin/components/embeddable-host.js.es6   |  3 +-
 .../admin/components/ip-lookup.js.es6         |  3 +-
 .../components/penalty-post-action.js.es6     |  3 +-
 .../admin/components/permalink-form.js.es6    |  5 +--
 .../admin/components/resumable-upload.js.es6  | 16 ++++----
 .../screened-ip-address-form.js.es6           |  5 +--
 .../admin/components/themes-list-item.js.es6  |  3 +-
 .../admin/components/watched-word-form.js.es6 |  5 +--
 .../admin-customize-colors-show.js.es6        |  3 +-
 .../admin-dashboard-reports.js.es6            |  3 +-
 .../admin-logs-staff-action-logs.js.es6       |  3 +-
 .../controllers/admin-site-text-index.js.es6  |  5 +--
 .../controllers/admin-user-badges.js.es6      |  3 +-
 .../admin-watched-words-action.js.es6         |  3 +-
 .../lib/buffered-render.js.es6                |  3 +-
 .../mixins/focus-event.js.es6                 |  3 +-
 app/assets/javascripts/discourse-loader.js    | 18 ---------
 .../add-category-tag-classes.js.es6           |  3 +-
 .../components/choose-message.js.es6          |  5 ++-
 .../discourse/components/choose-topic.js.es6  |  3 +-
 .../discourse/components/composer-body.js.es6 | 15 +++----
 .../components/composer-editor.js.es6         | 39 ++++++++++---------
 .../components/composer-messages.js.es6       |  3 +-
 .../components/composer-title.js.es6          | 13 +++----
 .../components/composer-user-selector.js.es6  |  3 +-
 .../discourse/components/cook-text.js.es6     |  3 +-
 .../discourse/components/d-editor.js.es6      | 26 ++++++-------
 .../discourse/components/d-modal-body.js.es6  |  3 +-
 .../discourse/components/d-modal.js.es6       |  5 +--
 .../discourse/components/date-input.js.es6    |  3 +-
 .../discourse/components/date-picker.js.es6   |  3 +-
 .../components/discourse-topic.js.es6         | 12 ++----
 .../components/discovery-topics-list.js.es6   | 10 ++---
 .../components/edit-category-tab.js.es6       |  3 +-
 .../edit-category-topic-template.js.es6       |  3 +-
 .../components/edit-topic-timer-form.js.es6   |  3 +-
 .../components/expanding-text-area.js.es6     |  3 +-
 .../components/flag-selection.js.es6          |  3 +-
 .../discourse/components/footer-nav.js.es6    |  3 +-
 .../discourse/components/global-notice.js.es6 |  8 ++--
 .../components/group-flair-inputs.js.es6      |  3 +-
 .../components/image-uploader.js.es6          |  5 +--
 .../discourse/components/link-to-input.js.es6 |  3 +-
 .../discourse/components/login-modal.js.es6   |  3 +-
 .../discourse/components/mobile-nav.js.es6    |  5 +--
 .../discourse/components/mount-widget.js.es6  | 10 ++---
 .../components/navigation-bar.js.es6          |  5 +--
 .../components/pwa-install-banner.js.es6      |  6 ++-
 .../discourse/components/quote-button.js.es6  |  3 +-
 .../components/scroll-tracker.js.es6          |  3 +-
 .../components/scrolling-post-stream.js.es6   | 12 +++---
 .../components/search-advanced-options.js.es6 |  6 +--
 .../discourse/components/share-panel.js.es6   |  3 +-
 .../discourse/components/share-popup.js.es6   | 10 ++---
 .../discourse/components/signup-cta.js.es6    |  6 ++-
 .../discourse/components/site-header.js.es6   |  9 ++---
 .../discourse/components/text-overflow.js.es6 |  3 +-
 .../discourse/components/time-input.js.es6    |  3 +-
 .../components/topic-entrance.js.es6          |  3 +-
 .../discourse/components/topic-list.js.es6    |  5 ++-
 .../components/topic-navigation.js.es6        | 10 ++---
 .../components/topic-progress.js.es6          | 14 ++++---
 .../components/topic-timeline.js.es6          |  3 +-
 .../components/topic-timer-info.js.es6        | 10 +++--
 .../discourse/components/user-stream.js.es6   |  3 +-
 .../discourse/controllers/auth-token.js.es6   |  3 +-
 .../discourse/controllers/change-owner.js.es6 |  3 +-
 .../controllers/change-timestamp.js.es6       |  3 +-
 .../discourse/controllers/composer.js.es6     |  3 +-
 .../discourse/controllers/exception.js.es6    |  3 +-
 .../controllers/insert-hyperlink.js.es6       |  9 ++---
 .../discourse/controllers/jump-to-post.js.es6 |  3 +-
 .../discourse/controllers/login.js.es6        |  6 +--
 .../controllers/move-to-topic.js.es6          |  3 +-
 .../second-factor-backup-edit.js.es6          |  3 +-
 .../discourse/controllers/topic.js.es6        |  6 +--
 .../initializers/asset-version.js.es6         |  3 +-
 .../initializers/auth-complete.js.es6         |  3 +-
 .../discourse/initializers/mobile.js.es6      |  3 +-
 .../javascripts/discourse/lib/ajax.js.es6     |  7 ++--
 .../discourse/lib/autocomplete.js.es6         | 10 ++---
 .../discourse/lib/clean-dom.js.es6            |  3 +-
 .../discourse/lib/click-track.js.es6          |  3 +-
 .../javascripts/discourse/lib/debounce.js.es6 |  3 +-
 .../lib/desktop-notifications.js.es6          |  5 +--
 .../discourse/lib/keyboard-shortcuts.js.es6   |  8 ++--
 .../lib/link-category-hashtags.js.es6         |  3 +-
 .../discourse/lib/link-mentions.js.es6        |  3 +-
 .../discourse/lib/link-tag-hashtag.js.es6     |  3 +-
 .../discourse/lib/load-script.js.es6          |  3 +-
 .../discourse/lib/page-tracker.js.es6         |  3 +-
 .../discourse/lib/safari-hacks.js.es6         |  6 ++-
 .../discourse/lib/screen-track.js.es6         |  3 +-
 .../javascripts/discourse/lib/throttle.js.es6 |  3 +-
 .../javascripts/discourse/lib/url.js.es6      | 10 ++---
 .../mixins/card-contents-base.js.es6          |  9 ++---
 .../discourse/mixins/docking.js.es6           |  3 +-
 .../mixins/mobile-scroll-direction.js.es6     |  3 +-
 .../discourse/mixins/scroll-top.js.es6        |  3 +-
 .../discourse/mixins/scrolling.js.es6         |  3 +-
 .../discourse/models/composer.js.es6          |  9 ++---
 .../discourse/routes/application.js.es6       |  6 +--
 .../discourse/routes/associate-account.js.es6 |  3 +-
 .../discourse/routes/discourse.js.es6         |  3 +-
 .../routes/discovery-categories.js.es6        |  5 ++-
 .../discourse/routes/forgot-password.js.es6   |  3 +-
 .../javascripts/discourse/routes/login.js.es6 |  3 +-
 .../discourse/routes/new-message.js.es6       |  5 +--
 .../discourse/routes/new-topic.js.es6         |  3 +-
 .../discourse/routes/signup.js.es6            |  5 +--
 .../discourse/routes/topic-from-params.js.es6 |  3 +-
 .../javascripts/discourse/routes/topic.js.es6 | 13 +++----
 .../widgets/component-connector.js.es6        |  3 +-
 .../discourse/widgets/connector.js.es6        |  3 +-
 .../javascripts/discourse/widgets/glue.js.es6 |  8 ++--
 .../discourse/widgets/hamburger-menu.js.es6   |  3 +-
 .../discourse/widgets/header.js.es6           |  3 +-
 .../discourse/widgets/post-menu.js.es6        |  6 +--
 .../discourse/widgets/post-stream.js.es6      |  3 +-
 .../discourse/widgets/search-menu.js.es6      |  6 +--
 .../discourse/widgets/topic-timeline.js.es6   |  3 +-
 .../discourse/widgets/user-menu.js.es6        |  3 +-
 .../javascripts/pretty-text/oneboxer.js.es6   |  5 +--
 .../pretty-text/upload-short-url.js.es6       |  3 +-
 .../select-kit/mixins/dom-helpers.js.es6      | 14 +++----
 .../select-kit/mixins/events.js.es6           |  8 ++--
 .../wizard/components/invite-list.js.es6      |  3 +-
 .../wizard/components/radio-button.js.es6     |  3 +-
 .../wizard/components/wizard-step.js.es6      |  5 +--
 app/assets/javascripts/wizard/lib/ajax.js.es6 |  5 +--
 .../javascripts/wizard/lib/preview.js.es6     |  3 +-
 .../wizard/test/acceptance/wizard-test.js.es6 |  3 +-
 .../wizard/test/helpers/start-app.js.es6      |  3 +-
 lib/pretty_text.rb                            |  1 -
 .../discourse-local-dates-create-form.js.es6  |  7 ++--
 .../composer-presence-display.js.es6          | 13 +++----
 .../components/topic-presence-display.js.es6  |  6 +--
 .../acceptance/composer-test.js.es6           |  3 +-
 test/javascripts/acceptance/modal-test.js.es6 |  3 +-
 .../components/d-editor-test.js.es6           |  3 +-
 .../javascripts/controllers/topic-test.js.es6 |  3 +-
 test/javascripts/helpers/qunit-helpers.js.es6 |  6 +--
 test/javascripts/lib/click-track-test.js.es6  |  3 +-
 test/javascripts/models/nav-item-test.js.es6  |  3 +-
 test/javascripts/test_helper.js               |  9 ++++-
 test/javascripts/widgets/widget-test.js.es6   |  3 +-
 153 files changed, 319 insertions(+), 493 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
index ccacb2e705..67bc308948 100644
--- a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { renderSpinner } from "discourse/helpers/loading-spinner";
@@ -54,7 +53,7 @@ export default Component.extend(
       // force rerender
       this.rerenderBuffer();
 
-      scheduleOnce("afterRender", this, this._scrollDown);
+      Ember.run.scheduleOnce("afterRender", this, this._scrollDown);
     }, 150),
 
     buildBuffer(buffer) {
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 1f23998d6b..6ad48208b4 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,5 +1,3 @@
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
@@ -13,7 +11,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      debounce(this, this._scheduleChartRendering, 500);
+      Ember.run.debounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -33,11 +31,11 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    debounce(this, this._scheduleChartRendering, 100);
+    Ember.run.debounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this._renderChart(
         this.model,
         this.element && this.element.querySelector(".chart-canvas")
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 77604527ed..1d70da8fed 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,5 +1,3 @@
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
@@ -11,7 +9,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      debounce(this, this._scheduleChartRendering, 500);
+      Ember.run.debounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -31,11 +29,11 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    debounce(this, this._scheduleChartRendering, 100);
+    Ember.run.debounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       if (!this.element) {
         return;
       }
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 5b3fbdd9a5..4efdf09926 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -314,7 +313,7 @@ export default Component.extend({
 
     this.setProperties({ isLoading: true, rateLimitationString: null });
 
-    next(() => {
+    Ember.run.next(() => {
       let payload = this._buildPayload(["prev_period"]);
 
       const callback = response => {
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
index 1dec9fce37..8120456821 100644
--- a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
+++ b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
@@ -84,7 +83,7 @@ export default Component.extend({
 
     toggleMaximize: function() {
       this.toggleProperty("maximized");
-      next(() => this.appEvents.trigger("ace:resize"));
+      Ember.run.next(() => this.appEvents.trigger("ace:resize"));
     },
 
     onlyOverriddenChanged(value) {
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.es6
index f186b291f1..7b6cef4527 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import UserField from "admin/models/user-field";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -29,7 +28,7 @@ export default Component.extend(bufferedProperty("userField"), {
   @observes("editing")
   _focusOnEdit() {
     if (this.editing) {
-      scheduleOnce("afterRender", this, "_focusName");
+      Ember.run.scheduleOnce("afterRender", this, "_focusName");
     }
   },
 
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 6c02f78dd5..f6f0025354 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as loadScript, loadCSS } from "discourse/lib/load-script";
 
@@ -38,7 +37,7 @@ export default Component.extend({
   didInsertElement() {
     loadScript("/javascripts/spectrum.js").then(() => {
       loadCSS("/javascripts/spectrum.css").then(() => {
-        schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           $(this.element.querySelector(".picker"))
             .spectrum({ color: "#" + this.hexValue })
             .on("change.spectrum", (me, color) => {
@@ -48,7 +47,7 @@ export default Component.extend({
         });
       });
     });
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.hexValueChanged();
     });
   }
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index debb6b25b1..746bfeede3 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
@@ -15,7 +14,7 @@ export default Component.extend(bufferedProperty("host"), {
   @on("didInsertElement")
   @observes("editing")
   _focusOnInput() {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.element.querySelector(".host-name").focus();
     });
   },
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index 8438a4ee5c..f97deff711 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -79,7 +78,7 @@ export default Component.extend({
       $(document.body).append($copyRange);
       if (copyText(text, $copyRange[0])) {
         this.set("copied", true);
-        later(() => this.set("copied", false), 2000);
+        Ember.run.later(() => this.set("copied", false), 2000);
       }
       $copyRange.remove();
     },
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index 7fefa0f3e5..dcb3bd3ba5 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -24,7 +23,7 @@ export default Component.extend({
 
       // If we switch to edit mode, jump to the edit textarea
       if (postAction === "edit") {
-        scheduleOnce("afterRender", () => {
+        Ember.run.scheduleOnce("afterRender", () => {
           let elem = this.element;
           let body = elem.closest(".modal-body");
           body.scrollTop(body.height());
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index b1f82ea295..74efe085d9 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
@@ -21,7 +20,7 @@ export default Component.extend({
   },
 
   focusPermalink() {
-    schedule("afterRender", () =>
+    Ember.run.schedule("afterRender", () =>
       this.element.querySelector(".permalink-url").focus()
     );
   },
@@ -70,7 +69,7 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       $(this.element.querySelector(".external-url")).keydown(e => {
         // enter key
         if (e.keyCode === 13) {
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index d63a1a651d..8f6a291325 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,5 +1,3 @@
-import { schedule } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -47,16 +45,18 @@ export default Component.extend(
         this.resumable.upload();
 
         // mark as uploading
-        later(() => this.set("isUploading", true));
+        Ember.run.later(() => this.set("isUploading", true));
       });
 
       this.resumable.on("fileProgress", file => {
         // update progress
-        later(() => this.set("progress", parseInt(file.progress() * 100, 10)));
+        Ember.run.later(() =>
+          this.set("progress", parseInt(file.progress() * 100, 10))
+        );
       });
 
       this.resumable.on("fileSuccess", file => {
-        later(() => {
+        Ember.run.later(() => {
           // mark as not uploading anymore
           this._reset();
 
@@ -66,7 +66,7 @@ export default Component.extend(
       });
 
       this.resumable.on("fileError", (file, message) => {
-        later(() => {
+        Ember.run.later(() => {
           // mark as not uploading anymore
           this._reset();
 
@@ -78,7 +78,7 @@ export default Component.extend(
 
     @on("didInsertElement")
     _assignBrowse() {
-      schedule("afterRender", () =>
+      Ember.run.schedule("afterRender", () =>
         this.resumable.assignBrowse($(this.element))
       );
     },
@@ -117,7 +117,7 @@ export default Component.extend(
     click() {
       if (this.isUploading) {
         this.resumable.cancel();
-        later(() => this._reset());
+        Ember.run.later(() => this._reset());
         return false;
       } else {
         return true;
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.es6
index 8b6db57764..1b20d7f39c 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /**
   A form to create an IP address that will be blocked or whitelisted.
@@ -63,7 +62,7 @@ export default Component.extend({
           .then(result => {
             this.setProperties({ ip_address: "", formSubmitted: false });
             this.action(ScreenedIpAddress.create(result.screened_ip_address));
-            schedule("afterRender", () =>
+            Ember.run.schedule("afterRender", () =>
               this.element.querySelector(".ip-address-input").focus()
             );
           })
@@ -85,7 +84,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _init() {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       $(this.element.querySelector(".ip-address-input")).keydown(e => {
         if (e.keyCode === 13) {
           this.send("submit");
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 6d68f4d8e3..62e5dff884 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -34,7 +33,7 @@ export default Component.extend({
   },
 
   scheduleAnimation() {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.animate(true);
     });
   },
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index 74bbeeff1e..919f6de9ef 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import WatchedWord from "admin/models/watched-word";
 import {
@@ -65,7 +64,7 @@ export default Component.extend({
               message: I18n.t("admin.watched_words.form.success")
             });
             this.action(WatchedWord.create(result));
-            schedule("afterRender", () =>
+            Ember.run.schedule("afterRender", () =>
               this.element.querySelector(".watched-word-input").focus()
             );
           })
@@ -87,7 +86,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _init() {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       $(this.element.querySelector(".watched-word-input")).keydown(e => {
         if (e.keyCode === 13) {
           this.send("submit");
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.es6
index ce99c2cfea..df5d71d3de 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -42,7 +41,7 @@ export default Controller.extend({
         );
       }
 
-      later(() => {
+      Ember.run.later(() => {
         this.set("model.savingStatus", null);
       }, 2000);
 
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 b582f733aa..12cc0400f1 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 const { get } = Ember;
@@ -22,7 +21,7 @@ export default Controller.extend({
 
   actions: {
     filterReports(filter) {
-      debounce(this, this._performFiltering, filter, 250);
+      Ember.run.debounce(this, this._performFiltering, filter, 250);
     }
   },
 
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.es6
index 65df52b7f6..da3afb72c5 100644
--- 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.es6
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
@@ -69,7 +68,7 @@ export default Controller.extend({
   },
 
   scheduleRefresh() {
-    scheduleOnce("afterRender", this, this._refresh);
+    Ember.run.scheduleOnce("afterRender", this, this._refresh);
   },
 
   actions: {
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.es6
index 1a1b266ae1..15a16be72b 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
 let lastSearch;
 
@@ -28,14 +27,14 @@ export default Controller.extend({
     toggleOverridden() {
       this.toggleProperty("overridden");
       this.set("searching", true);
-      debounce(this, this._performSearch, 400);
+      Ember.run.debounce(this, this._performSearch, 400);
     },
 
     search() {
       const q = this.q;
       if (q !== lastSearch) {
         this.set("searching", true);
-        debounce(this, this._performSearch, 400);
+        Ember.run.debounce(this, this._performSearch, 400);
         lastSearch = q;
       }
     }
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 eed2c23ec4..51f1787fe0 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
@@ -72,7 +71,7 @@ export default Controller.extend(GrantBadgeController, {
       ).then(
         () => {
           this.set("badgeReason", "");
-          next(() => {
+          Ember.run.next(() => {
             // Update the selected badge ID after the combobox has re-rendered.
             const newSelectedBadge = this.grantableBadges[0];
             if (newSelectedBadge) {
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 4435eb9b25..be982921db 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,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
@@ -52,7 +51,7 @@ export default Controller.extend({
       if (a) {
         a.words.unshiftObject(arg);
         a.incrementProperty("count");
-        schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           // remove from other actions lists
           let match = null;
           this.get("adminWatchedWords.model").forEach(action => {
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
index d3d301212a..8e23ba55ee 100644
--- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 // Ember 2.0 removes buffered rendering, but we can still implement it ourselves.
 // In the long term we'll want to remove this.
 
@@ -14,7 +13,7 @@ const Mixin = {
   },
 
   rerenderBuffer() {
-    scheduleOnce("render", this, this._customRender);
+    Ember.run.scheduleOnce("render", this, this._customRender);
   }
 };
 
diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
index 974d73c958..3f70e353b8 100644
--- a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
+++ b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
@@ -1,11 +1,10 @@
-import { bind } from "@ember/runloop";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Mixin.create({
   ready() {
     this._super(...arguments);
 
-    this._onChangeHandler = bind(this, this._onChange);
+    this._onChangeHandler = Ember.run.bind(this, this._onChange);
 
     // Default to true
     Discourse.set("hasFocus", true);
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 68128b1f6a..1762d116aa 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -14,29 +14,11 @@ var define, requirejs;
       "@ember/object": { default: Ember.Object },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
       "@ember/routing/route": { default: Ember.Route },
-      "@ember/runloop": {
-        bind: Ember.run.bind,
-        cancel: Ember.run.cancel,
-        debounce: Ember.testing ? Ember.run : Ember.run.debounce,
-        later: Ember.run.later,
-        next: Ember.run.next,
-        once: Ember.run.once,
-        run: Ember.run,
-        schedule: Ember.run.schedule,
-        scheduleOnce: Ember.run.scheduleOnce,
-        throttle: Ember.run.throttle
-      },
       "@ember/service": {
         default: Ember.Service,
         inject: Ember.inject.service
       }
     };
-  } else if (typeof __PRETTY_TEXT !== "undefined") {
-    // This is a hack because our server side code includes the pretty_text bundle
-    // which relies on ember now that we're using modules properly.
-    // The proper fix would be to move the upload urls code out of the pretty text
-    // bundle and remove this code. It should never be called;
-    EMBER_MODULES["@ember/runloop"] = {};
   }
 
   var _isArray;
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.es6
index d4a75e6ebe..209367e829 100644
--- a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
+++ b/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
@@ -27,7 +26,7 @@ export default Component.extend({
 
   @observes("category.fullSlug", "tags")
   refreshClass() {
-    scheduleOnce("afterRender", this, this._updateClass);
+    Ember.run.scheduleOnce("afterRender", this, this._updateClass);
   },
 
   _removeClass() {
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index be174ad685..b4518c2c4f 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
@@ -58,7 +57,9 @@ export default Component.extend({
     chooseMessage(message) {
       const messageId = Ember.get(message, "id");
       this.set("selectedTopicId", messageId);
-      next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
+      Ember.run.next(() =>
+        $(`#choose-message-${messageId}`).prop("checked", "true")
+      );
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index a31aa5eee4..df0d3b1c47 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
@@ -63,7 +62,7 @@ export default Component.extend({
   actions: {
     chooseTopic(topic) {
       this.set("selectedTopicId", topic.id);
-      next(() => {
+      Ember.run.next(() => {
         document.getElementById(`choose-topic-${topic.id}`).checked = true;
       });
       return false;
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index f265917279..7fea43389d 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -1,8 +1,3 @@
-import { throttle } from "@ember/runloop";
-import { run } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -65,7 +60,7 @@ export default Component.extend(KeyEnterEscape, {
     "composer.canEditTopicFeaturedLink"
   )
   resize() {
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       if (!this.element || this.isDestroying || this.isDestroyed) {
         return;
       }
@@ -83,8 +78,8 @@ export default Component.extend(KeyEnterEscape, {
 
     // One second from now, check to see if the last key was hit when
     // we recorded it. If it was, the user paused typing.
-    cancel(this._lastKeyTimeout);
-    this._lastKeyTimeout = later(() => {
+    Ember.run.cancel(this._lastKeyTimeout);
+    this._lastKeyTimeout = Ember.run.later(() => {
       if (lastKeyUp !== this._lastKeyUp) {
         return;
       }
@@ -121,7 +116,7 @@ export default Component.extend(KeyEnterEscape, {
 
     const throttledPerformDrag = (event => {
       event.preventDefault();
-      throttle(this, performDrag, event, THROTTLE_RATE);
+      Ember.run.throttle(this, performDrag, event, THROTTLE_RATE);
     }).bind(this);
 
     const endDrag = () => {
@@ -158,7 +153,7 @@ export default Component.extend(KeyEnterEscape, {
     this._super(...arguments);
     this.setupComposerResizeEvents();
 
-    const resize = () => run(() => this.resize());
+    const resize = () => Ember.run(() => this.resize());
     const triggerOpen = () => {
       if (this.get("composer.composeState") === Composer.OPEN) {
         this.appEvents.trigger("composer:opened");
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 8042d248da..cc419e1af9 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,8 +1,3 @@
-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 Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import {
@@ -188,7 +183,7 @@ export default Component.extend({
         transformComplete: v => v.username || v.name,
         afterComplete() {
           // ensures textarea scroll position is correct
-          scheduleOnce("afterRender", () => $input.blur().focus());
+          Ember.run.scheduleOnce("afterRender", () => $input.blur().focus());
         }
       });
     }
@@ -197,7 +192,13 @@ export default Component.extend({
       this._initInputPreviewSync($input, $preview);
     } else {
       $input.on("scroll", () =>
-        throttle(this, this._syncEditorAndPreviewScroll, $input, $preview, 20)
+        Ember.run.throttle(
+          this,
+          this._syncEditorAndPreviewScroll,
+          $input,
+          $preview,
+          20
+        )
       );
     }
 
@@ -315,7 +316,7 @@ export default Component.extend({
       this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
     });
 
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       $input.on("touchstart mouseenter", () => {
         if (!$preview.is(":visible")) return;
         $preview.off("scroll");
@@ -341,7 +342,7 @@ export default Component.extend({
       this.set("shouldBuildScrollMap", false);
     }
 
-    throttle(this, $callback, $input, $preview, this.scrollMap, 20);
+    Ember.run.throttle(this, $callback, $input, $preview, this.scrollMap, 20);
   },
 
   _teardownInputPreviewSync() {
@@ -558,7 +559,7 @@ export default Component.extend({
   },
 
   _warnMentionedGroups($preview) {
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       var found = this.warnedGroupMentions || [];
       $preview.find(".mention-group.notify").each((idx, e) => {
         const $e = $(e);
@@ -586,7 +587,7 @@ export default Component.extend({
       return;
     }
 
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       let found = this.warnedCannotSeeMentions || [];
 
       $preview.find(".mention.cannot-see").each((idx, e) => {
@@ -596,7 +597,7 @@ export default Component.extend({
         if (found.indexOf(name) === -1) {
           // add a delay to allow for typing, so you don't open the warning right away
           // previously we would warn after @bob even if you were about to mention @bob2
-          later(
+          Ember.run.later(
             this,
             () => {
               if (
@@ -617,7 +618,7 @@ export default Component.extend({
   },
 
   _resetUpload(removePlaceholder) {
-    next(() => {
+    Ember.run.next(() => {
       if (this._validUploads > 0) {
         this._validUploads--;
       }
@@ -896,9 +897,9 @@ export default Component.extend({
   @on("willDestroyElement")
   _composerClosed() {
     this.appEvents.trigger("composer:will-close");
-    next(() => {
+    Ember.run.next(() => {
       // need to wait a bit for the "slide down" transition of the composer
-      later(
+      Ember.run.later(
         () => this.appEvents.trigger("composer:closed"),
         Ember.testing ? 0 : 400
       );
@@ -969,7 +970,7 @@ export default Component.extend({
       // Paint mentions
       const unseenMentions = linkSeenMentions($preview, this.siteSettings);
       if (unseenMentions.length) {
-        debounce(
+        Ember.run.debounce(
           this,
           this._renderUnseenMentions,
           $preview,
@@ -984,7 +985,7 @@ export default Component.extend({
       // Paint category hashtags
       const unseenCategoryHashtags = linkSeenCategoryHashtags($preview);
       if (unseenCategoryHashtags.length) {
-        debounce(
+        Ember.run.debounce(
           this,
           this._renderUnseenCategoryHashtags,
           $preview,
@@ -997,7 +998,7 @@ export default Component.extend({
       if (this.siteSettings.tagging_enabled) {
         const unseenTagHashtags = linkSeenTagHashtags($preview);
         if (unseenTagHashtags.length) {
-          debounce(
+          Ember.run.debounce(
             this,
             this._renderUnseenTagHashtags,
             $preview,
@@ -1008,7 +1009,7 @@ export default Component.extend({
       }
 
       // Paint oneboxes
-      debounce(
+      Ember.run.debounce(
         this,
         () => {
           const oneboxes = {};
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 82a4fceeaf..fb07997b80 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import LinkLookup from "discourse/lib/link-lookup";
 
@@ -25,7 +24,7 @@ export default Component.extend({
     this.appEvents.on("composer:find-similar", this, this._findSimilar);
     this.appEvents.on("composer-messages:close", this, this._closeTop);
     this.appEvents.on("composer-messages:create", this, this._create);
-    scheduleOnce("afterRender", this, this.reset);
+    Ember.run.scheduleOnce("afterRender", this, this.reset);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 540f1b36eb..459d1bd0a6 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,6 +1,3 @@
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -27,7 +24,7 @@ export default Component.extend({
     }
 
     if (this.get("composer.titleLength") > 0) {
-      debounce(this, this._titleChanged, 10);
+      Ember.run.debounce(this, this._titleChanged, 10);
     }
   },
 
@@ -82,13 +79,13 @@ export default Component.extend({
     }
 
     if (Ember.testing) {
-      next(() =>
+      Ember.run.next(() =>
         // not ideal but we don't want to run this in current
         // runloop to avoid an error in console
         this._checkForUrl()
       );
     } else {
-      debounce(this, this._checkForUrl, 500);
+      Ember.run.debounce(this, this._checkForUrl, 500);
     }
   },
 
@@ -137,14 +134,14 @@ export default Component.extend({
           })
           .finally(() => {
             this.set("composer.loading", false);
-            schedule("afterRender", () => {
+            Ember.run.schedule("afterRender", () => {
               $(this.element.querySelector("input")).putCursorAtEnd();
             });
           });
       } else {
         this._updatePost(loadOnebox);
         this.set("composer.loading", false);
-        schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           $(this.element.querySelector("input")).putCursorAtEnd();
         });
       }
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
index 3e9aa03784..694db1cfd3 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -77,7 +76,7 @@ export default Component.extend({
     toggleSelector() {
       this.set("showSelector", true);
 
-      schedule("afterRender", () => {
+      Ember.run.schedule("afterRender", () => {
         $(this.element)
           .find("input")
           .focus();
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index 256636a3c5..e9e19b338f 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { cookAsync } from "discourse/lib/text";
 import { ajax } from "discourse/lib/ajax";
@@ -13,7 +12,7 @@ const CookText = Component.extend({
       this.set("cooked", cooked);
       // no choice but to defer this cause
       // pretty text may only be loaded now
-      next(() =>
+      Ember.run.next(() =>
         window
           .requireModule("pretty-text/upload-short-url")
           .resolveAllShortUrls(ajax)
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index e839fad6c6..185223be34 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,8 +1,3 @@
-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 { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /*global Mousetrap:true */
@@ -254,7 +249,7 @@ export default Component.extend({
     this._applyEmojiAutocomplete($editorInput);
     this._applyCategoryHashtagAutocomplete($editorInput);
 
-    scheduleOnce("afterRender", this, this._readyNow);
+    Ember.run.scheduleOnce("afterRender", this, this._readyNow);
 
     const mouseTrap = Mousetrap(this.element.querySelector(".d-editor-input"));
     const shortcuts = this.get("toolbar.shortcuts");
@@ -353,7 +348,7 @@ export default Component.extend({
         return;
       }
       this.set("preview", cooked);
-      scheduleOnce("afterRender", () => {
+      Ember.run.scheduleOnce("afterRender", () => {
         if (this._state !== "inDOM") {
           return;
         }
@@ -377,7 +372,7 @@ export default Component.extend({
     if (Ember.testing) {
       this._updatePreview();
     } else {
-      debounce(this, this._updatePreview, 30);
+      Ember.run.debounce(this, this._updatePreview, 30);
     }
   },
 
@@ -437,14 +432,17 @@ export default Component.extend({
             emojiPickerIsActive: true
           });
 
-          schedule("afterRender", () => {
+          Ember.run.schedule("afterRender", () => {
             const filterInput = document.querySelector(
               ".emoji-picker input[name='filter']"
             );
             if (filterInput) {
               filterInput.value = v.term;
 
-              later(() => filterInput.dispatchEvent(new Event("input")), 50);
+              Ember.run.later(
+                () => filterInput.dispatchEvent(new Event("input")),
+                50
+              );
             }
           });
 
@@ -549,7 +547,7 @@ export default Component.extend({
   },
 
   _selectText(from, length) {
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       const textarea = this.element.querySelector("textarea.d-editor-input");
       const $textarea = $(textarea);
       const oldScrollPos = $textarea.scrollTop();
@@ -558,7 +556,7 @@ export default Component.extend({
       }
       textarea.selectionStart = from;
       textarea.selectionEnd = from + length;
-      next(() => $textarea.trigger("change"));
+      Ember.run.next(() => $textarea.trigger("change"));
       $textarea.scrollTop(oldScrollPos);
     });
   },
@@ -787,7 +785,7 @@ export default Component.extend({
     $textarea.val(value);
     $textarea.prop("selectionStart", insert.length);
     $textarea.prop("selectionEnd", insert.length);
-    next(() => $textarea.trigger("change"));
+    Ember.run.next(() => $textarea.trigger("change"));
     this._focusTextArea();
   },
 
@@ -888,7 +886,7 @@ export default Component.extend({
   // ensures textarea scroll position is correct
   _focusTextArea() {
     const textarea = this.element.querySelector("textarea.d-editor-input");
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       textarea.blur();
       textarea.focus();
     });
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index a8543095ab..33b444d05b 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   classNames: ["modal-body"],
@@ -15,7 +14,7 @@ export default Component.extend({
       fixedParent.modal("show");
     }
 
-    scheduleOnce("afterRender", this, this._afterFirstRender);
+    Ember.run.scheduleOnce("afterRender", this, this._afterFirstRender);
     this.appEvents.on("modal-body:flash", this, "_flash");
     this.appEvents.on("modal-body:clearFlash", this, "_clearFlash");
   },
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 19d4d2264c..0c83f529ad 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 import Component from "@ember/component";
 
@@ -33,11 +32,11 @@ export default Component.extend({
   setUp() {
     $("html").on("keydown.discourse-modal", e => {
       if (e.which === 27 && this.dismissable) {
-        next(() => $(".modal-header button.modal-close").click());
+        Ember.run.next(() => $(".modal-header button.modal-close").click());
       }
 
       if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        next(() => $(".modal-footer .btn-primary").click());
+        Ember.run.next(() => $(".modal-footer .btn-primary").click());
       }
     });
 
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js.es6
index 927be37881..0161fb8aa2 100644
--- a/app/assets/javascripts/discourse/components/date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/date-input.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -38,7 +37,7 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      next(() => {
+      Ember.run.next(() => {
         const default_opts = {
           field: this.element.querySelector(".date-picker"),
           container: container || this.element,
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index e9403326bb..7fc28a50ef 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -31,7 +30,7 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      next(() => {
+      Ember.run.next(() => {
         const options = {
           field: this.element.querySelector(".date-picker"),
           container: container || null,
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 796e0a9068..53ab8edbbe 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,7 +1,3 @@
-import { throttle } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import AddArchetypeClass from "discourse/mixins/add-archetype-class";
@@ -54,13 +50,13 @@ export default Component.extend(
       const enteredAt = this.enteredAt;
       if (enteredAt && this.lastEnteredAt !== enteredAt) {
         this._lastShowTopic = null;
-        schedule("afterRender", () => this.scrolled());
+        Ember.run.schedule("afterRender", () => this.scrolled());
         this.set("lastEnteredAt", enteredAt);
       }
     },
 
     _highlightPost(postNumber) {
-      scheduleOnce("afterRender", null, highlight, postNumber);
+      Ember.run.scheduleOnce("afterRender", null, highlight, postNumber);
     },
 
     _hideTopicInHeader() {
@@ -82,7 +78,7 @@ export default Component.extend(
           this.pauseHeaderTopicUpdate = true;
           this._lastShowTopic = true;
 
-          later(() => {
+          Ember.run.later(() => {
             this._lastShowTopic = false;
             this.pauseHeaderTopicUpdate = false;
           }, debounceDuration);
@@ -196,7 +192,7 @@ export default Component.extend(
       // at the start of the scroll. This feels a lot more snappy compared to waiting
       // for the scroll to end if we debounce.
       if (this.site.mobileView && this.hasScrolled) {
-        throttle(
+        Ember.run.throttle(
           this,
           this.calculateDirection,
           offset,
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 6706cacd4a..c9b2bb92bb 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,3 @@
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
@@ -14,9 +12,11 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
   _readjustScrollPosition() {
     const scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
+      Ember.run.schedule("afterRender", () =>
+        $(window).scrollTop(scrollTo + 1)
+      );
     } else {
-      scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
+      Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
     }
   },
 
@@ -38,7 +38,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
     loadMore() {
       Discourse.updateContextCount(0);
       this.model.loadMore().then(hasMoreResults => {
-        schedule("afterRender", () => this.saveScrollPosition());
+        Ember.run.schedule("afterRender", () => this.saveScrollPosition());
         if (!hasMoreResults) {
           this.eyeline.flushRest();
         } else if ($(window).height() >= $(document).height()) {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 42be7233af..15aae0ed28 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -21,7 +20,7 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-    scheduleOnce("afterRender", this, this._addToCollection);
+    Ember.run.scheduleOnce("afterRender", this, this._addToCollection);
   },
 
   _addToCollection: function() {
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.es6
index c3254cc3d6..b1d5c79d81 100644
--- a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
@@ -1,10 +1,9 @@
-import { scheduleOnce } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
 export default buildCategoryPanel("topic-template", {
   _activeTabChanged: function() {
     if (this.activeTab) {
-      scheduleOnce("afterRender", () =>
+      Ember.run.scheduleOnce("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
       );
     }
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.es6
index c46af80e2f..5d01c739e7 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -74,7 +73,7 @@ export default Component.extend({
   @observes("selection")
   _updateBasedOnLastPost() {
     if (!this.autoClose) {
-      schedule("afterRender", () => {
+      Ember.run.schedule("afterRender", () => {
         this.set("topicTimer.based_on_last_post", false);
       });
     }
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 d2b980a8f2..7008eb1d01 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -1,11 +1,10 @@
-import { scheduleOnce } from "@ember/runloop";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import autosize from "discourse/lib/autosize";
 
 export default Ember.TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       $(this.element).focus();
       autosize(this.element);
     });
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js.es6
index b52f544907..f039b30660 100644
--- a/app/assets/javascripts/discourse/components/flag-selection.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-selection.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
@@ -17,6 +16,6 @@ export default Component.extend({
 
   @observes("nameKey")
   selectedChanged() {
-    next(this, this._selectRadio);
+    Ember.run.next(this, this._selectRadio);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js.es6 b/app/assets/javascripts/discourse/components/footer-nav.js.es6
index d94910364e..7ac143225a 100644
--- a/app/assets/javascripts/discourse/components/footer-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/footer-nav.js.es6
@@ -1,4 +1,3 @@
-import { throttle } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import MobileScrollDirection from "discourse/mixins/mobile-scroll-direction";
 import Scrolling from "discourse/mixins/scrolling";
@@ -79,7 +78,7 @@ const FooterNavComponent = MountWidget.extend(
 
       const offset = window.pageYOffset || $("html").scrollTop();
 
-      throttle(
+      Ember.run.throttle(
         this,
         this.calculateDirection,
         offset,
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 1b288f5429..5bacd98013 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,4 +1,3 @@
-import { bind } from "@ember/runloop";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
@@ -89,10 +88,13 @@ export default Component.extend(
 
     @on("didInsertElement")
     _setupLogsNotice() {
-      this._boundRerenderBuffer = bind(this, this.rerenderBuffer);
+      this._boundRerenderBuffer = Ember.run.bind(this, this.rerenderBuffer);
       LogsNotice.current().addObserver("hidden", this._boundRerenderBuffer);
 
-      this._boundResetCurrentProp = bind(this, this._resetCurrentProp);
+      this._boundResetCurrentProp = Ember.run.bind(
+        this,
+        this._resetCurrentProp
+      );
       $(this.element).on(
         "click.global-notice",
         ".alert-logs-notice .close",
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index a190ffda1d..a80512b93d 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -26,7 +25,7 @@ export default Component.extend({
 
   @observes("model.flair_url")
   _loadSVGIcon() {
-    debounce(this, this._loadIcon, 1000);
+    Ember.run.debounce(this, this._loadIcon, 1000);
   },
 
   _loadIcon() {
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index ca919959a8..9142c17e60 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
@@ -78,13 +77,13 @@ export default Component.extend(UploadMixin, {
   },
 
   _openLightbox() {
-    next(() =>
+    Ember.run.next(() =>
       $(this.element.querySelector("a.lightbox")).magnificPopup("open")
     );
   },
 
   _applyLightbox() {
-    if (this.imageUrl) next(() => lightbox($(this.element)));
+    if (this.imageUrl) Ember.run.next(() => lightbox($(this.element)));
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js.es6
index 19015ec0e8..653761018e 100644
--- a/app/assets/javascripts/discourse/components/link-to-input.js.es6
+++ b/app/assets/javascripts/discourse/components/link-to-input.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   showInput: false,
@@ -6,7 +5,7 @@ export default Component.extend({
   click() {
     this.onClick();
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       $(this.element)
         .find("input")
         .focus();
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
index 2ee72f8722..e8bbe98c87 100644
--- a/app/assets/javascripts/discourse/components/login-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
@@ -15,7 +14,7 @@ export default Component.extend({
       this.set("loginName", $.cookie("email"));
     }
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       $(
         "#login-account-password, #login-account-name, #login-second-factor"
       ).keydown(e => {
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index a47c09c5c4..a60a107079 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 
@@ -22,7 +21,7 @@ export default Component.extend({
   @observes("currentPath")
   currentPathChanged() {
     this.set("expanded", false);
-    next(() => this._updateSelectedHtml());
+    Ember.run.next(() => this._updateSelectedHtml());
   },
 
   _updateSelectedHtml() {
@@ -42,7 +41,7 @@ export default Component.extend({
     toggleExpanded() {
       this.toggleProperty("expanded");
 
-      next(() => {
+      Ember.run.next(() => {
         if (this.expanded) {
           $(window)
             .off("click.mobile-nav")
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 1363750b81..5f0e584977 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,5 +1,3 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
 import { WidgetClickHook } from "discourse/widgets/hooks";
@@ -52,7 +50,7 @@ export default Component.extend({
 
     this._rootNode = document.createElement("div");
     this.element.appendChild(this._rootNode);
-    this._timeout = scheduleOnce("render", this, this.rerenderWidget);
+    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
   },
 
   willClearRender() {
@@ -70,7 +68,7 @@ export default Component.extend({
       const [eventName, caller] = evt;
       this.appEvents.off(eventName, this, caller);
     });
-    cancel(this._timeout);
+    Ember.run.cancel(this._timeout);
   },
 
   afterRender() {},
@@ -99,13 +97,13 @@ export default Component.extend({
       this._renderCallback = callback;
     }
 
-    scheduleOnce("render", this, this.rerenderWidget);
+    Ember.run.scheduleOnce("render", this, this.rerenderWidget);
   },
 
   buildArgs() {},
 
   rerenderWidget() {
-    cancel(this._timeout);
+    Ember.run.cancel(this._timeout);
 
     if (this._rootNode) {
       if (!this._widgetClass) {
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index bf2947fc1d..01dacde789 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -70,7 +69,7 @@ export default Component.extend({
       if (this.expanded) {
         DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        next(() => {
+        Ember.run.next(() => {
           if (!this.expanded) {
             return;
           }
@@ -78,7 +77,7 @@ export default Component.extend({
           $(this.element.querySelector(".drop a")).on("click", () => {
             this.element.querySelector(".drop").style.display = "none";
 
-            next(() => {
+            Ember.run.next(() => {
               if (!this.element || this.isDestroying || this.isDestroyed) {
                 return;
               }
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
index e2e60f3d88..b6c9df818b 100644
--- a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
@@ -1,4 +1,3 @@
-import { bind } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -19,7 +18,10 @@ export default Component.extend({
 
   @on("didInsertElement")
   _registerListener() {
-    this._promptEventHandler = bind(this, this._handleInstallPromptEvent);
+    this._promptEventHandler = Ember.run.bind(
+      this,
+      this._handleInstallPromptEvent
+    );
     window.addEventListener("beforeinstallprompt", this._promptEventHandler);
   },
 
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index ec8b8c47e8..f16bf6690d 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { selectedText } from "discourse/lib/utilities";
@@ -104,7 +103,7 @@ export default Component.extend({
     }
 
     // change the position of the button
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       let top = markerOffset.top;
       let left = markerOffset.left + Math.max(0, parentScrollLeft);
 
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
index 7637845c1e..dad7447f0c 100644
--- a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
+++ b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import Scrolling from "discourse/mixins/scrolling";
 
@@ -20,7 +19,7 @@ export default Component.extend(Scrolling, {
 
     const data = this.session.get(this.trackerName);
     if (data && data.position >= 0 && data.tag === this.tag) {
-      next(() => $(window).scrollTop(data.position + 1));
+      Ember.run.next(() => $(window).scrollTop(data.position + 1));
     }
   },
 
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..89a48126f3 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,3 @@
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { 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";
@@ -207,7 +204,7 @@ export default MountWidget.extend({
               // will cause the browser to scroll to the top of the document
               // in Chrome. This makes sure the scroll works correctly if that
               // happens.
-              next(() => $("html, body").scrollTop(whereY));
+              Ember.run.next(() => $("html, body").scrollTop(whereY));
             }
           });
         };
@@ -273,7 +270,7 @@ export default MountWidget.extend({
   },
 
   _scrollTriggered() {
-    scheduleOnce("afterRender", this, this.scrolled);
+    Ember.run.scheduleOnce("afterRender", this, this.scrolled);
   },
 
   _posted(staged) {
@@ -309,12 +306,13 @@ export default MountWidget.extend({
   },
 
   _debouncedScroll() {
-    debounce(this, this._scrollTriggered, 10);
+    Ember.run.debounce(this, this._scrollTriggered, 10);
   },
 
   didInsertElement() {
     this._super(...arguments);
-    const debouncedScroll = () => debounce(this, this._scrollTriggered, 10);
+    const debouncedScroll = () =>
+      Ember.run.debounce(this, this._scrollTriggered, 10);
 
     this._previouslyNearby = {};
 
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 8f1779487d..333b6d6549 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,3 @@
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -74,13 +72,13 @@ export default Component.extend({
 
     this._init();
 
-    scheduleOnce("afterRender", () => this._update());
+    Ember.run.scheduleOnce("afterRender", () => this._update());
   },
 
   @observes("searchTerm")
   _updateOptions() {
     this._update();
-    debounce(this, this._update, 250);
+    Ember.run.debounce(this, this._update, 250);
   },
 
   _init() {
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6
index 45b9317145..65f5cfd964 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/share-panel.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -48,7 +47,7 @@ export default Component.extend({
       this.element.querySelector(".topic-share-url-for-touch a")
     );
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       if (!this.capabilities.touch) {
         $linkForTouch.parent().remove();
 
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 49d8f67723..17e05c47c9 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,5 +1,3 @@
-import { bind } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
@@ -91,7 +89,7 @@ export default Component.extend({
     this.set("link", url);
     this.set("visible", true);
 
-    scheduleOnce("afterRender", this, this._focusUrl);
+    Ember.run.scheduleOnce("afterRender", this, this._focusUrl);
   },
 
   _mouseDownHandler(event) {
@@ -156,9 +154,9 @@ export default Component.extend({
 
   @on("init")
   _setupHandlers() {
-    this._boundMouseDownHandler = bind(this, this._mouseDownHandler);
-    this._boundClickHandler = bind(this, this._clickHandler);
-    this._boundKeydownHandler = bind(this, this._keydownHandler);
+    this._boundMouseDownHandler = Ember.run.bind(this, this._mouseDownHandler);
+    this._boundClickHandler = Ember.run.bind(this, this._clickHandler);
+    this._boundKeydownHandler = Ember.run.bind(this, this._keydownHandler);
   },
 
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index 49536eff37..d7630e2681 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   action: "showCreateAccount",
@@ -11,7 +10,10 @@ export default Component.extend({
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
-      later(() => this.session.set("showSignupCta", false), 20 * 1000);
+      Ember.run.later(
+        () => this.session.set("showSignupCta", false),
+        20 * 1000
+      );
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index b7b82071c1..41c71a48e5 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -1,6 +1,3 @@
-import { cancel } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import { observes } from "ember-addons/ember-computed-decorators";
 import Docking from "discourse/mixins/docking";
@@ -41,7 +38,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
   _animateClosing($panel, menuOrigin, windowWidth) {
     $panel.css(menuOrigin, -windowWidth);
     this._animate = true;
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.eventDispatched("dom:clean", "header");
       this._panMenuOffset = 0;
     });
@@ -225,7 +222,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
     this.appEvents.off("header:hide-topic", this, "setTopic");
     this.appEvents.off("dom:clean", this, "_cleanDom");
 
-    cancel(this._scheduledRemoveAnimate);
+    Ember.run.cancel(this._scheduledRemoveAnimate);
     window.cancelAnimationFrame(this._scheduledMovingAnimation);
   },
 
@@ -349,7 +346,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
       if (this._animate) {
         $panel.addClass("animate");
         $headerCloak.addClass("animate");
-        this._scheduledRemoveAnimate = later(() => {
+        this._scheduledRemoveAnimate = Ember.run.later(() => {
           $panel.removeClass("animate");
           $headerCloak.removeClass("animate");
         }, 200);
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index d5bc066fb0..37a4cb2959 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,9 +1,8 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
-    next(null, () => {
+    Ember.run.next(null, () => {
       const $this = $(this.element);
 
       if ($this) {
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js.es6
index 6ec44fb306..c9c65e1034 100644
--- a/app/assets/javascripts/discourse/components/time-input.js.es6
+++ b/app/assets/javascripts/discourse/components/time-input.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { isNumeric } from "discourse/lib/utilities";
 
@@ -37,7 +36,7 @@ export default Component.extend({
           this._processMinutesChange(value);
         }
 
-        schedule("afterRender", () => (event.target.value = value));
+        Ember.run.schedule("afterRender", () => (event.target.value = value));
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
index ead6913e82..f55197d804 100644
--- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import CleansUp from "discourse/mixins/cleans-up";
@@ -78,7 +77,7 @@ export default Component.extend(CleansUp, {
 
     this.setProperties({ topic: data.topic, visible: true });
 
-    scheduleOnce("afterRender", this, this._setCSS);
+    Ember.run.scheduleOnce("afterRender", this, this._setCSS);
 
     $("html")
       .off("mousedown.topic-entrance")
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 870c68f9c8..c099c8b790 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -70,7 +69,9 @@ export default Component.extend(LoadMore, {
 
     let scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
+      Ember.run.schedule("afterRender", () =>
+        $(window).scrollTop(scrollTo + 1)
+      );
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index b2115e755d..4a67114f1a 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,6 +1,4 @@
 import EmberObject from "@ember/object";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
@@ -54,7 +52,7 @@ export default Component.extend(PanEvents, {
   },
 
   _checkSize() {
-    scheduleOnce("afterRender", this, this._performCheckSize);
+    Ember.run.scheduleOnce("afterRender", this, this._performCheckSize);
   },
 
   // we need to store this so topic progress has something to init with
@@ -90,7 +88,7 @@ export default Component.extend(PanEvents, {
   composerOpened() {
     this.set("composerOpen", true);
     // we need to do the check after animation is done
-    later(() => this._checkSize(), 500);
+    Ember.run.later(() => this._checkSize(), 500);
   },
 
   composerClosed() {
@@ -101,7 +99,7 @@ export default Component.extend(PanEvents, {
   _collapseFullscreen() {
     if (this.get("info.topicProgressExpanded")) {
       $(".timeline-fullscreen").removeClass("show");
-      later(() => {
+      Ember.run.later(() => {
         if (!this.element || this.isDestroying || this.isDestroyed) {
           return;
         }
@@ -139,7 +137,7 @@ export default Component.extend(PanEvents, {
     } else if (offset <= 0) {
       $timelineContainer.css("bottom", "");
     } else {
-      later(() => this._handlePanDone(offset, event), 20);
+      Ember.run.later(() => this._handlePanDone(offset, event), 20);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 19ec394b03..61db49b425 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -74,7 +73,7 @@ export default Component.extend({
 
   @observes("postStream.stream.[]")
   _updateBar() {
-    scheduleOnce("afterRender", this, this._updateProgressBar);
+    Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
   },
 
   _topicScrolled(event) {
@@ -101,11 +100,16 @@ export default Component.extend({
 
     const prevEvent = this.prevEvent;
     if (prevEvent) {
-      scheduleOnce("afterRender", this, this._topicScrolled, prevEvent);
+      Ember.run.scheduleOnce(
+        "afterRender",
+        this,
+        this._topicScrolled,
+        prevEvent
+      );
     } else {
-      scheduleOnce("afterRender", this, this._updateProgressBar);
+      Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
     }
-    scheduleOnce("afterRender", this, this._dock);
+    Ember.run.scheduleOnce("afterRender", this, this._dock);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 9aa6541065..1d9ec49b78 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import Docking from "discourse/mixins/docking";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -95,7 +94,7 @@ export default MountWidget.extend(Docking, {
     this._super(...arguments);
 
     if (this.fullscreen && !this.addShowClass) {
-      next(() => {
+      Ember.run.next(() => {
         this.set("addShowClass", true);
         this.queueRerender();
       });
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 bb26e0caba..c7e2ed244a 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,5 +1,3 @@
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -87,7 +85,11 @@ export default Component.extend(
 
         // TODO Sam: concerned this can cause a heavy rerender loop
         if (!Ember.testing) {
-          this._delayedRerender = later(this, this.rerender, rerenderDelay);
+          this._delayedRerender = Ember.run.later(
+            this,
+            this.rerender,
+            rerenderDelay
+          );
         }
       }
     },
@@ -108,7 +110,7 @@ export default Component.extend(
       $(this.element).off("click.topic-timer-remove", this.removeTopicTimer);
 
       if (this._delayedRerender) {
-        cancel(this._delayedRerender);
+        Ember.run.cancel(this._delayedRerender);
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index 16c7e1fb79..cbb9b779bc 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 import ClickTrack from "discourse/lib/click-track";
@@ -24,7 +23,7 @@ export default Component.extend(LoadMore, {
   classNames: ["user-stream"],
 
   _scrollTopOnModelChange: function() {
-    schedule("afterRender", () => $(document).scrollTop(0));
+    Ember.run.schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
   _inserted: Ember.on("didInsertElement", function() {
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
index a24f6a53b1..0a02adf223 100644
--- a/app/assets/javascripts/discourse/controllers/auth-token.js.es6
+++ b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
@@ -25,7 +24,7 @@ export default Controller.extend(ModalFunctionality, {
     highlightSecure() {
       this.send("closeModal");
 
-      next(() => {
+      Ember.run.next(() => {
         const $prefPasswordDiv = $(".pref-password");
 
         $prefPasswordDiv.addClass("highlighted");
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 6496ccb0be..28acef583e 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -54,7 +53,7 @@ export default Controller.extend(ModalFunctionality, {
           if (this.get("topicController.multiSelect")) {
             this.topicController.send("toggleMultiSelect");
           }
-          next(() =>
+          Ember.run.next(() =>
             DiscourseURL.routeTo(this.get("topicController.model.url"))
           );
         },
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 0251ab8883..7744b066e1 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -48,7 +47,7 @@ export default Controller.extend(ModalFunctionality, {
         .then(() => {
           this.send("closeModal");
           this.setProperties({ date: "", time: "", saving: false });
-          next(() => DiscourseURL.routeTo(topic.url));
+          Ember.run.next(() => DiscourseURL.routeTo(topic.url));
         })
         .catch(() =>
           this.flash(I18n.t("topic.change_timestamp.error"), "alert-error")
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index a4ecfb8476..01867e7c6a 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -1047,7 +1046,7 @@ export default Controller.extend({
 
   @observes("model.reply", "model.title")
   _shouldSaveDraft() {
-    debounce(this, this._saveDraft, 2000);
+    Ember.run.debounce(this, this._saveDraft, 2000);
   },
 
   @computed("model.categoryId", "lastValidatedAt")
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 2e3f44ae74..7b8a1bec8f 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import {
   on,
@@ -114,7 +113,7 @@ export default Controller.extend({
     tryLoading() {
       this.set("loading", true);
 
-      schedule("afterRender", () => {
+      Ember.run.schedule("afterRender", () => {
         this.lastTransition.retry();
         this.set("loading", false);
       });
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index 63b724f89c..e1d714be39 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,6 +1,3 @@
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
@@ -18,7 +15,7 @@ export default Controller.extend(ModalFunctionality, {
       selectedRow: -1
     });
 
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       const element = document.querySelector(".insert-link");
 
       element.addEventListener("keydown", e => this.keyDown(e));
@@ -138,7 +135,7 @@ export default Controller.extend(ModalFunctionality, {
       .closest(".modal-inner-container")
       .removeEventListener("mousedown", this.mouseDown);
 
-    cancel(this._debounced);
+    Ember.run.cancel(this._debounced);
   },
 
   actions: {
@@ -177,7 +174,7 @@ export default Controller.extend(ModalFunctionality, {
       }
     },
     search() {
-      this._debounced = debounce(this, this.triggerSearch, 400);
+      this._debounced = Ember.run.debounce(this, this.triggerSearch, 400);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index a0d4bd5950..af6fd216f5 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -11,7 +10,7 @@ export default Controller.extend(ModalFunctionality, {
   ),
 
   onShow() {
-    next(() => $("#post-jump").focus());
+    Ember.run.next(() => $("#post-jump").focus());
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 2501146805..ca94d979c0 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,6 +1,4 @@
 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 { ajax } from "discourse/lib/ajax";
@@ -152,7 +150,7 @@ export default Controller.extend(ModalFunctionality, {
 
               // only need to focus the 2FA input for TOTP
               if (!this.showSecurityKey) {
-                scheduleOnce("afterRender", () =>
+                Ember.run.scheduleOnce("afterRender", () =>
                   document
                     .getElementById("second-factor")
                     .querySelector("input")
@@ -324,7 +322,7 @@ export default Controller.extend(ModalFunctionality, {
     const loginError = (errorMsg, className, callback) => {
       showModal("login");
 
-      next(() => {
+      Ember.run.next(() => {
         if (callback) callback();
         this.flash(errorMsg, className || "success");
       });
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 7c8c84648c..8a89fc8e57 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -93,7 +92,7 @@ export default Controller.extend(ModalFunctionality, {
       );
     } else if (!this.canSplitTopic) {
       this.set("selection", "existing_topic");
-      next(() => $("#choose-topic-title").focus());
+      Ember.run.next(() => $("#choose-topic-title").focus());
     }
   },
 
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.es6
index 6554a77cd1..ddddfbdb30 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -103,7 +102,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   _hideCopyMessage() {
-    later(
+    Ember.run.later(
       () => this.setProperties({ successMessage: null, errorMessage: null }),
       2000
     );
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 06ac89f3ad..d31fe00292 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,6 +1,4 @@
 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 { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -135,7 +133,7 @@ export default Controller.extend(bufferedProperty("model"), {
       return;
     }
 
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       this.send("showHistory", post, revision);
     });
   },
@@ -1428,7 +1426,7 @@ export default Controller.extend(bufferedProperty("model"), {
         // automatically unpin topics when the user reaches the bottom
         const max = _.max(postNumbers);
         if (topic.get("pinned") && max >= topic.get("highest_post_number")) {
-          next(() => topic.clearPin());
+          Ember.run.next(() => topic.clearPin());
         }
       }
     }
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
index f685d1b091..21faedd650 100644
--- a/app/assets/javascripts/discourse/initializers/asset-version.js.es6
+++ b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 //  Subscribe to "asset-version" change events via the Message Bus
 export default {
   name: "asset-version",
@@ -17,7 +16,7 @@ export default {
       if (!timeoutIsSet && Discourse.get("requiresRefresh")) {
         // Since we can do this transparently for people browsing the forum
         //  hold back the message 24 hours.
-        later(() => {
+        Ember.run.later(() => {
           bootbox.confirm(I18n.t("assets_changed_confirm"), function(result) {
             if (result) {
               document.location.reload();
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
index 31101d9010..83e0183ff3 100644
--- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 export default {
   name: "auth-complete",
   after: "inject-objects",
@@ -14,7 +13,7 @@ export default {
     if (lastAuthResult) {
       const router = container.lookup("router:main");
       router.one("didTransition", () => {
-        next(() =>
+        Ember.run.next(() =>
           Discourse.authenticationComplete(JSON.parse(lastAuthResult))
         );
       });
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6
index b0708fca85..a536398e94 100644
--- a/app/assets/javascripts/discourse/initializers/mobile.js.es6
+++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import Mobile from "discourse/lib/mobile";
 import { setResolverOption } from "discourse-common/resolver";
 import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
@@ -18,7 +17,7 @@ export default {
     setResolverOption("mobileView", Mobile.mobileView);
 
     if (isAppWebview()) {
-      later(() => {
+      Ember.run.later(() => {
         postRNWebviewMessage(
           "headerBg",
           $(".d-header").css("background-color")
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js.es6
index e2bb45ef08..cafa6e6f70 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import pageVisible from "discourse/lib/page-visible";
 import logout from "discourse/lib/logout";
 
@@ -97,7 +96,7 @@ export function ajax() {
       handleRedirect(data);
       handleLogoff(xhr);
 
-      run(() => {
+      Ember.run(() => {
         Discourse.Site.currentProp(
           "isReadOnly",
           !!xhr.getResponseHeader("Discourse-Readonly")
@@ -108,7 +107,7 @@ export function ajax() {
         data = { result: data, xhr: xhr };
       }
 
-      run(null, resolve, data);
+      Ember.run(null, resolve, data);
     };
 
     args.error = (xhr, textStatus, errorThrown) => {
@@ -129,7 +128,7 @@ export function ajax() {
       xhr.jqTextStatus = textStatus;
       xhr.requestedUrl = url;
 
-      run(null, reject, {
+      Ember.run(null, reject, {
         jqXHR: xhr,
         textStatus: textStatus,
         errorThrown: errorThrown
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 0bcb3331c8..18fc9a98e2 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -1,5 +1,3 @@
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
 /**
   This is a jQuery plugin to support autocompleting values in our text fields.
 
@@ -45,7 +43,7 @@ export default function(options) {
   if (this.length === 0) return;
 
   if (options === "destroy" || options.updateData) {
-    cancel(inputTimeout);
+    Ember.run.cancel(inputTimeout);
 
     $(this)
       .off("keyup.autocomplete")
@@ -404,7 +402,7 @@ export default function(options) {
   $(this).on("click.autocomplete", () => closeAutocomplete());
 
   $(this).on("paste.autocomplete", () => {
-    later(() => me.trigger("keydown"), 50);
+    Ember.run.later(() => me.trigger("keydown"), 50);
   });
 
   function checkTriggerRule(opts) {
@@ -457,8 +455,8 @@ export default function(options) {
     if (options.allowAny) {
       // saves us wiring up a change event as well
 
-      cancel(inputTimeout);
-      inputTimeout = later(function() {
+      Ember.run.cancel(inputTimeout);
+      inputTimeout = Ember.run.later(function() {
         if (inputSelectedItems.length === 0) {
           inputSelectedItems.push("");
         }
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
index 82cdb2d537..8d83f4d7f8 100644
--- a/app/assets/javascripts/discourse/lib/clean-dom.js.es6
+++ b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 function _clean() {
   if (window.MiniProfiler) {
     window.MiniProfiler.pageTransition();
@@ -36,5 +35,5 @@ function _clean() {
 }
 
 export function cleanDOM() {
-  scheduleOnce("afterRender", _clean);
+  Ember.run.scheduleOnce("afterRender", _clean);
 }
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index 6e27ebbbe2..42a65623a6 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
@@ -135,7 +134,7 @@ export default {
           $link.attr("href", null);
           $link.data("auto-route", true);
 
-          later(() => {
+          Ember.run.later(() => {
             $link.removeClass("no-href");
             $link.attr("href", $link.data("href"));
             $link.data("href", null);
diff --git a/app/assets/javascripts/discourse/lib/debounce.js.es6 b/app/assets/javascripts/discourse/lib/debounce.js.es6
index f41b71f0d8..6ab2eb1e58 100644
--- a/app/assets/javascripts/discourse/lib/debounce.js.es6
+++ b/app/assets/javascripts/discourse/lib/debounce.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 /**
   Debounce a Javascript function. This means if it's called many times in a time limit it
   should only be executed once (at the end of the limit counted from the last call made).
@@ -14,6 +13,6 @@ export default function(func, wait) {
     self = this;
     args = arguments;
 
-    debounce(null, later, wait);
+    Ember.run.debounce(null, later, wait);
   };
 }
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 330772014d..41b86bc30e 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import KeyValueStore from "discourse/lib/key-value-store";
 import { formatUsername } from "discourse/lib/utilities";
@@ -80,7 +79,7 @@ function confirmNotification() {
   const clickEventHandler = () => notification.close();
 
   notification.addEventListener("click", clickEventHandler);
-  later(() => {
+  Ember.run.later(() => {
     notification.close();
     notification.removeEventListener("click", clickEventHandler);
   }, 10 * 1000);
@@ -178,7 +177,7 @@ function onNotification(data) {
     }
 
     notification.addEventListener("click", clickEventHandler);
-    later(() => {
+    Ember.run.later(() => {
       notification.close();
       notification.removeEventListener("click", clickEventHandler);
     }, 10 * 1000);
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 991644737a..aa0b16efbb 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,5 +1,3 @@
-import { run } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
@@ -142,7 +140,7 @@ export default {
   quoteReply() {
     this.sendToSelectedPost("replyToPost");
     // lazy but should work for now
-    later(() => $(".d-editor .quote").click(), 500);
+    Ember.run.later(() => $(".d-editor .quote").click(), 500);
 
     return false;
   },
@@ -212,7 +210,7 @@ export default {
   },
 
   showPageSearch(event) {
-    run(() => {
+    Ember.run(() => {
       this.appEvents.trigger("header:keyboard-trigger", {
         type: "page-search",
         event
@@ -221,7 +219,7 @@ export default {
   },
 
   printTopic(event) {
-    run(() => {
+    Ember.run(() => {
       if ($(".container.posts").length) {
         event.preventDefault(); // We need to stop printing the current page in Firefox
         this.container.lookup("controller:topic").print();
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
index 7179f234f1..d43b0f4a83 100644
--- a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
 
@@ -8,7 +7,7 @@ const testedKey = "tested";
 const testedClass = `hashtag-${testedKey}`;
 
 function updateFound($hashtags, categorySlugs) {
-  schedule("afterRender", () => {
+  Ember.run.schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const categorySlug = categorySlugs[index];
       const link = validCategoryHashtags[categorySlug];
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 68d0b8b5d6..07f37388e4 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { formatUsername } from "discourse/lib/utilities";
@@ -40,7 +39,7 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  scheduleOnce("afterRender", function() {
+  Ember.run.scheduleOnce("afterRender", function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
index 5aa3f6d612..a0b2c95c46 100644
--- a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
@@ -8,7 +7,7 @@ const checkedTagHashtags = [];
 const testedClass = "tag-hashtag-tested";
 
 function updateFound($hashtags, tagValues) {
-  schedule("afterRender", () => {
+  Ember.run.schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const tagValue = tagValues[index];
       const link = validTagHashtags[tagValue];
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index c1f11ec0f4..34b3f2897b 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 const _loaded = {};
 const _loading = {};
@@ -23,7 +22,7 @@ function loadWithTag(path, cb) {
     ) {
       s = s.onload = s.onreadystatechange = null;
       if (!abort) {
-        run(null, cb);
+        Ember.run(null, cb);
       }
     }
   };
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index 4acbdc4ea3..d7577ed5ae 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 let _started = false;
 let cache = {};
 let transitionCount = 0;
@@ -32,7 +31,7 @@ export function startPageTracking(router, appEvents) {
 
     // Refreshing the title is debounced, so we need to trigger this in the
     // next runloop to have the correct title.
-    next(() => {
+    Ember.run.next(() => {
       let title = Discourse.get("_docTitle");
 
       appEvents.trigger("page:changed", {
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index ac64d26461..e613ba16e3 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
 import {
   safariHacksDisabled,
@@ -95,7 +94,10 @@ function positioningWorkaround($fixedElement) {
 
       if (!iOSWithVisualViewport()) {
         fixedElement.style.height = oldHeight;
-        later(() => $(fixedElement).removeClass("no-transition"), 500);
+        Ember.run.later(
+          () => $(fixedElement).removeClass("no-transition"),
+          500
+        );
       }
 
       $(window).scrollTop(originalScrollTop);
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index 314e1fac0a..a36b15cb21 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -1,4 +1,3 @@
-import { bind } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 
 // We use this class to track how long posts in a topic are on the screen.
@@ -27,7 +26,7 @@ export default class {
     // Create an interval timer if we don't have one.
     if (!this._interval) {
       this._interval = setInterval(() => this.tick(), 1000);
-      this._boundScrolled = bind(this, this.scrolled);
+      this._boundScrolled = Ember.run.bind(this, this.scrolled);
       $(window).on("scroll.screentrack", this._boundScrolled);
     }
 
diff --git a/app/assets/javascripts/discourse/lib/throttle.js.es6 b/app/assets/javascripts/discourse/lib/throttle.js.es6
index 05daa36c5a..2e8673203b 100644
--- a/app/assets/javascripts/discourse/lib/throttle.js.es6
+++ b/app/assets/javascripts/discourse/lib/throttle.js.es6
@@ -1,4 +1,3 @@
-import { throttle } from "@ember/runloop";
 /**
   Throttle a Javascript function. This means if it's called many times in a time limit it
   should only be executed one time at most during this time limit
@@ -14,6 +13,6 @@ export default function(func, spacing, immediate) {
     self = this;
     args = arguments;
 
-    throttle(null, later, spacing, immediate);
+    Ember.run.throttle(null, later, spacing, immediate);
   };
 }
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 0dbb7aa3ce..085619f9e9 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,6 +1,4 @@
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
@@ -68,7 +66,7 @@ export function jumpToElement(elementId) {
 
   const selector = `#${elementId}, a[name=${elementId}]`;
   _jumpScheduled = true;
-  schedule("afterRender", function() {
+  Ember.run.schedule("afterRender", function() {
     const lockon = new LockOn(selector, {
       finished() {
         _jumpScheduled = false;
@@ -92,7 +90,7 @@ const DiscourseURL = EmberObject.extend({
 
     _transitioning = postNumber > 1;
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       let elementId;
       let holder;
 
@@ -158,7 +156,7 @@ const DiscourseURL = EmberObject.extend({
       // Always use replaceState in the next runloop to prevent weird routes changing
       // while URLs are loading. For example, while a topic loads it sets `currentPost`
       // which triggers a replaceState even though the topic hasn't fully loaded yet!
-      next(() => {
+      Ember.run.next(() => {
         const location = DiscourseURL.get("router.location");
         if (location && location.replaceURL) {
           location.replaceURL(path);
@@ -252,7 +250,7 @@ const DiscourseURL = EmberObject.extend({
     path = rewritePath(path);
 
     if (typeof opts.afterRouteComplete === "function") {
-      schedule("afterRender", opts.afterRouteComplete);
+      Ember.run.schedule("afterRender", opts.afterRouteComplete);
     }
 
     if (this.navigatedToPost(oldPath, path, opts)) {
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 69bafea2fb..212278f2e0 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,6 +1,3 @@
-import { throttle } from "@ember/runloop";
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
@@ -145,7 +142,7 @@ export default Ember.Mixin.create({
   _bindMobileScroll() {
     const mobileScrollEvent = this.mobileScrollEvent;
     const onScroll = () => {
-      throttle(this, this._close, 1000);
+      Ember.run.throttle(this, this._close, 1000);
     };
 
     $(window).on(mobileScrollEvent, onScroll);
@@ -174,7 +171,7 @@ export default Ember.Mixin.create({
 
     let verticalAdjustments = 0;
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       if (target) {
         if (!this.site.mobileView) {
           let position = target.offset();
@@ -248,7 +245,7 @@ export default Ember.Mixin.create({
         // note: we DO NOT use afterRender here cause _positionCard may
         // run afterwards, if we allowed this to happen the usercard
         // may be offscreen and we may scroll all the way to it on focus
-        next(null, () => {
+        Ember.run.next(null, () => {
           const firstLink = this.element.querySelector("a");
           firstLink && firstLink.focus();
         });
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js.es6
index 18a5ae5bf6..800898ae70 100644
--- a/app/assets/javascripts/discourse/mixins/docking.js.es6
+++ b/app/assets/javascripts/discourse/mixins/docking.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 const helper = {
   offset() {
     const mainOffset = $("#main").offset();
@@ -13,7 +12,7 @@ export default Ember.Mixin.create({
   init() {
     this._super(...arguments);
     this.queueDockCheck = () => {
-      debounce(this, this.safeDockCheck, 5);
+      Ember.run.debounce(this, this.safeDockCheck, 5);
     };
   },
 
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
index edd93096f0..0f27500a09 100644
--- a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
+++ b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 // Small buffer so that very tiny scrolls don't trigger mobile header switch
 const MOBILE_SCROLL_TOLERANCE = 5;
 
@@ -43,7 +42,7 @@ export default Ember.Mixin.create({
     // If the user reaches the very bottom of the topic, we only want to reset
     // this scroll direction after a second scrolldown. This is a nicer event
     // similar to what Safari and Chrome do.
-    debounce(() => {
+    Ember.run.debounce(() => {
       this._bottomHit = 1;
     }, 1000);
 
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index f666e9be5a..630227b8fa 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import { deprecated } from "discourse/mixins/scroll-top";
 
@@ -15,7 +14,7 @@ function scrollTop() {
   if (DiscourseURL.isJumpScheduled()) {
     return;
   }
-  scheduleOnce("afterRender", context, context._scrollTop);
+  Ember.run.scheduleOnce("afterRender", context, context._scrollTop);
 }
 
 export default Ember.Mixin.create({
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index f51474c0b2..690bf1168f 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
 
 /**
@@ -38,7 +37,7 @@ const Scrolling = Ember.Mixin.create({
       if (router.activeTransition) {
         return;
       }
-      return scheduleOnce("afterRender", this, "scrolled");
+      return Ember.run.scheduleOnce("afterRender", this, "scrolled");
     };
 
     if (opts.debounce) {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 3a265ab342..4d851e6e3a 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,7 +1,4 @@
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
@@ -997,7 +994,7 @@ const Composer = RestModel.extend({
               post.set("reply_count", post.reply_count - 1);
             }
           }
-          next(() => composer.set("composeState", OPEN));
+          Ember.run.next(() => composer.set("composeState", OPEN));
         })
       );
   },
@@ -1048,7 +1045,7 @@ const Composer = RestModel.extend({
     });
 
     if (this._clearingStatus) {
-      cancel(this._clearingStatus);
+      Ember.run.cancel(this._clearingStatus);
       this._clearingStatus = null;
     }
 
@@ -1088,7 +1085,7 @@ const Composer = RestModel.extend({
     const draftStatus = this.draftStatus;
 
     if (draftStatus && !this._clearingStatus) {
-      this._clearingStatus = later(
+      this._clearingStatus = Ember.run.later(
         this,
         () => {
           this.setProperties({ draftStatus: null, draftConflictUser: null });
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index cb1e5f0406..4130d7ffe6 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,5 +1,3 @@
-import { once } from "@ember/runloop";
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
@@ -58,7 +56,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     // Ember doesn't provider a router `willTransition` event so let's make one
     willTransition() {
       var router = getOwner(this).lookup("router:main");
-      once(router, router.trigger, "willTransition");
+      Ember.run.once(router, router.trigger, "willTransition");
       return this._super(...arguments);
     },
 
@@ -228,7 +226,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
   activate() {
     this._super(...arguments);
-    next(function() {
+    Ember.run.next(function() {
       // Support for callbacks once the application has activated
       ApplicationRoute.trigger("activate");
     });
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js.es6
index a182e85c88..7cbfee6754 100644
--- a/app/assets/javascripts/discourse/routes/associate-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/associate-account.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
@@ -8,7 +7,7 @@ export default DiscourseRoute.extend({
   beforeModel() {
     const params = this.paramsFor("associate-account");
     this.replaceWith(`preferences.account`, this.currentUser).then(() =>
-      next(() =>
+      Ember.run.next(() =>
         ajax(`/associate/${encodeURIComponent(params.token)}.json`)
           .then(model => showModal("associate-account-confirm", { model }))
           .catch(popupAjaxError)
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 2329168593..fb828bddd1 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,4 +1,3 @@
-import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
@@ -56,7 +55,7 @@ const DiscourseRoute = Route.extend({
     },
 
     refreshTitle() {
-      once(this, this._refreshTitleOnce);
+      Ember.run.once(this, this._refreshTitleOnce);
     },
 
     clearTopicDraft() {
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 125b6bf9d0..19543ae481 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
@@ -135,7 +134,9 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     didTransition() {
-      next(() => this.controllerFor("application").set("showFooter", true));
+      Ember.run.next(() =>
+        this.controllerFor("application").set("showFooter", true)
+      );
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
index 58309565b5..e88fbdb082 100644
--- a/app/assets/javascripts/discourse/routes/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { defaultHomepage } from "discourse/lib/utilities";
 import buildStaticRoute from "discourse/routes/build-static-route";
 
@@ -12,7 +11,7 @@ ForgotPasswordRoute.reopen({
     this.replaceWith(
       loginRequired ? "login" : `discovery.${defaultHomepage()}`
     ).then(e => {
-      next(() => e.send("showForgotPassword"));
+      Ember.run.next(() => e.send("showForgotPassword"));
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js.es6
index c41f884f30..8465ceb6bc 100644
--- a/app/assets/javascripts/discourse/routes/login.js.es6
+++ b/app/assets/javascripts/discourse/routes/login.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 import { defaultHomepage } from "discourse/lib/utilities";
 
@@ -8,7 +7,7 @@ LoginRoute.reopen({
   beforeModel() {
     if (!this.siteSettings.login_required) {
       this.replaceWith(`/${defaultHomepage()}`).then(e => {
-        next(() => e.send("showLogin"));
+        Ember.run.next(() => e.send("showLogin"));
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index c85001cbbf..1410c65356 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
@@ -16,7 +15,7 @@ export default DiscourseRoute.extend({
           User.findByUsername(encodeURIComponent(params.username))
             .then(user => {
               if (user.can_send_private_message_to_user) {
-                next(() =>
+                Ember.run.next(() =>
                   e.send(
                     "createNewMessageViaParams",
                     user.username,
@@ -36,7 +35,7 @@ export default DiscourseRoute.extend({
           Group.messageable(groupName)
             .then(result => {
               if (result.messageable) {
-                next(() =>
+                Ember.run.next(() =>
                   e.send(
                     "createNewMessageViaParams",
                     groupName,
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js.es6
index 550b4b5341..82b2b496ef 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
 
@@ -64,7 +63,7 @@ export default DiscourseRoute.extend({
   },
 
   _sendTransition(event, transition, categoryId) {
-    next(() => {
+    Ember.run.next(() => {
       event.send(
         "createNewTopicViaParams",
         transition.to.queryParams.title,
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js.es6
index 9a732c67d8..a2753ded2b 100644
--- a/app/assets/javascripts/discourse/routes/signup.js.es6
+++ b/app/assets/javascripts/discourse/routes/signup.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 
 const SignupRoute = buildStaticRoute("signup");
@@ -10,13 +9,13 @@ SignupRoute.reopen({
     if (!this.siteSettings.login_required) {
       this.replaceWith("discovery.latest").then(e => {
         if (canSignUp) {
-          next(() => e.send("showCreateAccount"));
+          Ember.run.next(() => e.send("showCreateAccount"));
         }
       });
     } else {
       this.replaceWith("login").then(e => {
         if (canSignUp) {
-          next(() => e.send("showCreateAccount"));
+          Ember.run.next(() => e.send("showCreateAccount"));
         }
       });
     }
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index 6f626644a4..c3d0e6cf72 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
@@ -58,7 +57,7 @@ export default DiscourseRoute.extend({
         topicController.subscribe();
 
         // Highlight our post after the next render
-        scheduleOnce("afterRender", () =>
+        Ember.run.scheduleOnce("afterRender", () =>
           this.appEvents.trigger("post:highlight", closest)
         );
 
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index f992c01c5b..e4b168ec7a 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,6 +1,3 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
@@ -171,9 +168,9 @@ const TopicRoute = DiscourseRoute.extend({
           postUrl += "/" + currentPost;
         }
 
-        cancel(scheduledReplace);
+        Ember.run.cancel(scheduledReplace);
         lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = later(
+        scheduledReplace = Ember.run.later(
           this,
           "_replaceUnlessScrolling",
           postUrl,
@@ -189,7 +186,7 @@ const TopicRoute = DiscourseRoute.extend({
 
     willTransition() {
       this._super(...arguments);
-      cancel(scheduledReplace);
+      Ember.run.cancel(scheduledReplace);
       isTransitioning = true;
       return true;
     }
@@ -204,7 +201,7 @@ const TopicRoute = DiscourseRoute.extend({
       return;
     }
     lastScrollPos = currentPos;
-    scheduledReplace = later(
+    scheduledReplace = Ember.run.later(
       this,
       "_replaceUnlessScrolling",
       url,
@@ -305,7 +302,7 @@ const TopicRoute = DiscourseRoute.extend({
     // We reset screen tracking every time a topic is entered
     this.screenTrack.start(model.get("id"), controller);
 
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       this.appEvents.trigger("header:update-topic", model);
     });
   }
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index 44eabe7c03..44add9ca7e 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 export default class ComponentConnector {
   constructor(widget, componentName, opts, trackedProperties) {
     this.widget = widget;
@@ -14,7 +13,7 @@ export default class ComponentConnector {
     const elem = $elem[0];
     const { opts, widget, componentName } = this;
 
-    next(() => {
+    Ember.run.next(() => {
       const mounted = widget._findView();
 
       const view = widget.register
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index d5d1c98f3d..b077bde0eb 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import deprecated from "discourse-common/lib/deprecated";
 
 export default class Connector {
@@ -12,7 +11,7 @@ export default class Connector {
     const elem = $elem[0];
 
     const { opts, widget } = this;
-    next(() => {
+    Ember.run.next(() => {
       const mounted = widget._findView();
 
       if (opts.templateName) {
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index c3a6af4b80..97fcbd3fe5 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,5 +1,3 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
 import { diff, patch } from "virtual-dom";
 import { queryRegistry } from "discourse/widgets/widget";
 import DirtyKeys from "discourse/lib/dirty-keys";
@@ -27,11 +25,11 @@ export default class WidgetGlue {
   }
 
   queueRerender() {
-    this._timeout = scheduleOnce("render", this, this.rerenderWidget);
+    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
   }
 
   rerenderWidget() {
-    cancel(this._timeout);
+    Ember.run.cancel(this._timeout);
 
     // in test mode return early if store cannot be found
     if (Ember.testing) {
@@ -53,6 +51,6 @@ export default class WidgetGlue {
   }
 
   cleanUp() {
-    cancel(this._timeout);
+    Ember.run.cancel(this._timeout);
   }
 }
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index b11689796a..4b25906350 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import DiscourseURL from "discourse/lib/url";
@@ -343,7 +342,7 @@ export default createWidget("hamburger-menu", {
       const $headerCloak = $(".header-cloak");
       $headerCloak.addClass("animate");
       $headerCloak.css("opacity", 0);
-      later(() => this.sendWidgetAction("toggleHamburger"), 200);
+      Ember.run.later(() => this.sendWidgetAction("toggleHamburger"), 200);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 02fd704dca..0d1d30cc9a 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { avatarImg } from "discourse/widgets/post";
@@ -420,7 +419,7 @@ export default createWidget("header", {
     this.updateHighlight();
 
     if (this.state.searchVisible) {
-      schedule("afterRender", () => {
+      Ember.run.schedule("afterRender", () => {
         const $searchInput = $("#search-term");
         $searchInput.focus().select();
 
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 3c70593130..c44035f76c 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,5 +1,3 @@
-import { run } from "@ember/runloop";
-import { next } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
@@ -9,7 +7,7 @@ const LIKE_ACTION = 2;
 
 function animateHeart($elem, start, end, complete) {
   if (Ember.testing) {
-    return run(this, complete);
+    return Ember.run(this, complete);
   }
 
   $elem
@@ -413,7 +411,7 @@ export default createWidget("post-menu", {
       const likedPostId = keyValueStore.getInt("likedPostId");
       if (likedPostId === attrs.id) {
         keyValueStore.remove("likedPostId");
-        next(() => this.sendWidgetAction("toggleLike"));
+        Ember.run.next(() => this.sendWidgetAction("toggleLike"));
       }
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
index 6406d1c9e8..9291d8a4e6 100644
--- a/app/assets/javascripts/discourse/widgets/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import transformPost from "discourse/lib/transform-post";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -40,7 +39,7 @@ export function cloak(post, component) {
   _heights[post.id] = $post.outerHeight();
 
   component.dirtyKeys.keyDirty(`post-${post.id}`);
-  debounce(component, "queueRerender", 1000);
+  Ember.run.debounce(component, "queueRerender", 1000);
 }
 
 export function uncloak(post, component) {
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 1bd428a835..808f3282c3 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,5 +1,3 @@
-import { debounce } from "@ember/runloop";
-import { later } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -32,7 +30,7 @@ const SearchHelper = {
     }
 
     this._cancelSearch = true;
-    later(() => (this._cancelSearch = false), 400);
+    Ember.run.later(() => (this._cancelSearch = false), 400);
   },
 
   perform(widget) {
@@ -287,7 +285,7 @@ export default createWidget("search-menu", {
     searchData.noResults = false;
     this.searchService().set("highlightTerm", searchData.term);
     searchData.loading = true;
-    debounce(SearchHelper, SearchHelper.perform, this, 400);
+    Ember.run.debounce(SearchHelper, SearchHelper.perform, this, 400);
   },
 
   moreOfType(type) {
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index 813a390ec5..eac0ac7b5c 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import ComponentConnector from "discourse/widgets/component-connector";
 import { h } from "virtual-dom";
@@ -401,7 +400,7 @@ export default createWidget("topic-timeline", {
     const stream = this.attrs.topic.get("postStream");
 
     // a little debounce to avoid flashing
-    later(() => {
+    Ember.run.later(() => {
       if (!this.state.position === scrollPosition) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index cf669d1edc..96e56fb7ac 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { formatUsername } from "discourse/lib/utilities";
@@ -228,7 +227,7 @@ export default createWidget("user-menu", {
       const $headerCloak = $(".header-cloak");
       $headerCloak.addClass("animate");
       $headerCloak.css("opacity", 0);
-      later(() => this.sendWidgetAction("toggleUserMenu"), 200);
+      Ember.run.later(() => this.sendWidgetAction("toggleUserMenu"), 200);
     }
   },
 
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index a500274a77..4753ec8015 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 let timeout;
 const loadingQueue = [];
 let localCache = {};
@@ -83,7 +82,7 @@ function loadNext(ajax) {
       }
     )
     .finally(() => {
-      timeout = later(() => loadNext(ajax), timeoutMs);
+      timeout = Ember.run.later(() => loadNext(ajax), timeoutMs);
       if (removeLoading) {
         $elem.removeClass(LOADING_ONEBOX_CSS_CLASS);
         $elem.data("onebox-loaded");
@@ -130,7 +129,7 @@ export function load({
   if (synchronous) {
     return loadNext(ajax);
   } else {
-    timeout = timeout || later(() => loadNext(ajax), 150);
+    timeout = timeout || Ember.run.later(() => loadNext(ajax), 150);
   }
 }
 
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
index 3a2f46805c..8b0b4db2b4 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
@@ -1,4 +1,3 @@
-import { debounce } from "@ember/runloop";
 let _cache = {};
 
 export function lookupCachedUploadUrl(shortUrl) {
@@ -101,7 +100,7 @@ export function resolveAllShortUrls(ajax) {
     $shortUploadUrls = $(attributes);
     if ($shortUploadUrls.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
-      return debounce(
+      return Ember.run.debounce(
         null,
         () => _loadShortUrls($shortUploadUrls, ajax),
         450,
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 62522d9edd..b086aa2e43 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -1,5 +1,3 @@
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Mixin.create({
@@ -94,8 +92,8 @@ export default Ember.Mixin.create({
   focusFilterOrHeader() {
     const context = this;
     // next so we are sure it finised expand/collapse
-    next(() => {
-      schedule("afterRender", () => {
+    Ember.run.next(() => {
+      Ember.run.schedule("afterRender", () => {
         if (
           !context.$filterInput() ||
           !context.$filterInput().is(":visible") ||
@@ -131,9 +129,9 @@ export default Ember.Mixin.create({
     this.focusFilterOrHeader();
     this.autoHighlight();
 
-    next(() => {
+    Ember.run.next(() => {
       this._boundaryActionHandler("onExpand", this);
-      schedule("afterRender", () => {
+      Ember.run.schedule("afterRender", () => {
         if (!this.isDestroying && !this.isDestroyed) {
           this._adjustPosition();
         }
@@ -146,9 +144,9 @@ export default Ember.Mixin.create({
 
     this.set("isExpanded", false);
 
-    next(() => {
+    Ember.run.next(() => {
       this._boundaryActionHandler("onCollapse", this);
-      schedule("afterRender", () => {
+      Ember.run.schedule("afterRender", () => {
         if (!this.isDestroying && !this.isDestroyed) {
           this._removeFixedPosition();
         }
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index f985da1616..0cbdf5da67 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,5 +1,3 @@
-import { throttle } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 
 const { bind } = Ember.run;
@@ -140,7 +138,7 @@ export default Ember.Mixin.create({
       this.set("renderedFilterOnce", true);
     }
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.$filterInput()
         .focus()
         .val(this.$filterInput().val() + String.fromCharCode(keyCode));
@@ -269,7 +267,7 @@ export default Ember.Mixin.create({
 
     const direction = keyCode === 38 ? -1 : 1;
 
-    throttle(this, this._moveHighlight, direction, $rows, 32);
+    Ember.run.throttle(this, this._moveHighlight, direction, $rows, 32);
   },
 
   didPressBackspaceFromFilter(event) {
@@ -430,7 +428,7 @@ export default Ember.Mixin.create({
   },
 
   _highlightRow($row) {
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       $row.trigger("mouseover").focus();
       this.focus();
     });
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index de04d70bab..e8b25973a6 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 
 export default Component.extend({
@@ -61,7 +60,7 @@ export default Component.extend({
       this.updateField();
 
       this.set("inviteEmail", "");
-      scheduleOnce("afterRender", () =>
+      Ember.run.scheduleOnce("afterRender", () =>
         this.element.querySelector(".invite-email").focus()
       );
     },
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index e7ceaa898f..b40d9839f1 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes, on } from "ember-addons/ember-computed-decorators";
 
@@ -14,7 +13,7 @@ export default Component.extend({
   @on("init")
   updateVal() {
     const checked = this.value === this.radioValue;
-    next(
+    Ember.run.next(
       () => (this.element.querySelector("input[type=radio]").checked = checked)
     );
   }
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index 1d034d1c47..c938d1e167 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import {
@@ -93,7 +92,7 @@ export default Component.extend({
   },
 
   autoFocus() {
-    scheduleOnce("afterRender", () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       const $invalid = $(".wizard-field.invalid:eq(0) .wizard-focusable");
 
       if ($invalid.length) {
@@ -105,7 +104,7 @@ export default Component.extend({
   },
 
   animateInvalidFields() {
-    scheduleOnce("afterRender", () =>
+    Ember.run.scheduleOnce("afterRender", () =>
       $(".invalid input[type=text], .invalid textarea").wiggle(2, 100)
     );
   },
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js.es6
index 64cc9571cc..9112c3787f 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js.es6
+++ b/app/assets/javascripts/wizard/lib/ajax.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import getUrl from "discourse-common/lib/get-url";
 import jQuery from "jquery";
 
@@ -15,8 +14,8 @@ export function getToken() {
 export function ajax(args) {
   return new Ember.RSVP.Promise((resolve, reject) => {
     args.headers = { "X-CSRF-Token": getToken() };
-    args.success = data => run(null, resolve, data);
-    args.error = xhr => run(null, reject, xhr);
+    args.success = data => Ember.run(null, resolve, data);
+    args.error = xhr => Ember.run(null, reject, xhr);
     args.url = getUrl(args.url);
     jQuery.ajax(args);
   });
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6
index d597bfae53..0ee5a35b27 100644
--- a/app/assets/javascripts/wizard/lib/preview.js.es6
+++ b/app/assets/javascripts/wizard/lib/preview.js.es6
@@ -1,4 +1,3 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 /*eslint no-bitwise:0 */
 import getUrl from "discourse-common/lib/get-url";
@@ -73,7 +72,7 @@ export function createPreviewComponent(width, height, obj) {
       },
 
       triggerRepaint() {
-        scheduleOnce("afterRender", this, "repaint");
+        Ember.run.scheduleOnce("afterRender", this, "repaint");
       },
 
       repaint() {
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
index 70a7e67fc0..1a4177542a 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import startApp from "wizard/test/helpers/start-app";
 
 var wizard;
@@ -8,7 +7,7 @@ QUnit.module("Acceptance: wizard", {
   },
 
   afterEach() {
-    run(wizard, "destroy");
+    Ember.run(wizard, "destroy");
   }
 });
 
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
index d82b237c35..233869bb1a 100644
--- a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import Wizard from "wizard/wizard";
 import initializer from "wizard/initializers/load-helpers";
 
@@ -6,7 +5,7 @@ let app;
 let started = false;
 
 export default function() {
-  run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
+  Ember.run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
 
   if (!started) {
     initializer.initialize(app);
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 8be1397497..d620320f1b 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -73,7 +73,6 @@ module PrettyText
       ctx.attach("console.log", proc { |l| p l })
       ctx.eval('window.console = console;')
     end
-    ctx.eval("__PRETTY_TEXT = true")
 
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
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 76e3d64088..6b2f7776f0 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,4 +1,3 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
@@ -56,7 +55,7 @@ export default Component.extend({
     if (markup) {
       cookAsync(markup).then(result => {
         this.set("currentPreview", result);
-        schedule("afterRender", () =>
+        Ember.run.schedule("afterRender", () =>
           this.$(".preview .discourse-local-date").applyLocalDates()
         );
       });
@@ -410,7 +409,7 @@ export default Component.extend({
       date = null;
     }
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this._picker.setMinDate(moment(date, this.dateFormat).toDate());
     });
   },
@@ -420,7 +419,7 @@ export default Component.extend({
       date = null;
     }
 
-    schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this._picker.setDate(moment.utc(date), true);
     });
   },
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 2e6521008e..c6818bb2ce 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,3 @@
-import { once } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -29,12 +26,12 @@ export default Component.extend({
   @on("didInsertElement")
   composerOpened() {
     this._lastPublish = new Date();
-    once(this, "updateState");
+    Ember.run.once(this, "updateState");
   },
 
   @observes("action", "post.id", "topic.id")
   composerStateChanged() {
-    once(this, "updateState");
+    Ember.run.once(this, "updateState");
   },
 
   @observes("reply", "title")
@@ -47,8 +44,8 @@ export default Component.extend({
   @on("willDestroyElement")
   composerClosing() {
     this.publish({ previous: this.currentState });
-    cancel(this._pingTimer);
-    cancel(this._clearTimer);
+    Ember.run.cancel(this._pingTimer);
+    Ember.run.cancel(this._clearTimer);
   },
 
   updateState() {
@@ -97,7 +94,7 @@ export default Component.extend({
         r.messagebus_channel,
         message => {
           if (!this.isDestroyed) this.set("presenceUsers", message.users);
-          this._clearTimer = debounce(
+          this._clearTimer = Ember.run.debounce(
             this,
             "clear",
             keepAliveDuration + bufferTime
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 37abc00f30..e6861cdf6b 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,3 @@
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -28,7 +26,7 @@ export default Component.extend({
       this.channel,
       message => {
         if (!this.isDestroyed) this.set("presenceUsers", message.users);
-        this._clearTimer = debounce(
+        this._clearTimer = Ember.run.debounce(
           this,
           "clear",
           keepAliveDuration + bufferTime
@@ -40,7 +38,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   _destroyed() {
-    cancel(this._clearTimer);
+    Ember.run.cancel(this._clearTimer);
     this.messageBus.unsubscribe(this.channel);
   },
 
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 39573aa31b..262146ab3d 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
@@ -85,7 +84,7 @@ QUnit.test("Tests the Composer controls", async assert => {
   event[mac ? "metaKey" : "ctrlKey"] = true;
   event.keyCode = 66;
 
-  run(() => textarea.dispatchEvent(event));
+  Ember.run(() => textarea.dispatchEvent(event));
 
   const example = I18n.t(`composer.bold_text`);
   assert.equal(
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 13725f4d6c..45a7114672 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -1,4 +1,3 @@
-import { run } from "@ember/runloop";
 import { acceptance, controllerFor } from "helpers/qunit-helpers";
 import showModal from "discourse/lib/show-modal";
 
@@ -38,7 +37,7 @@ QUnit.test("modal", async function(assert) {
     '{{#d-modal-body title="" class="" dismissable=false}}test{{/d-modal-body}}'
   );
 
-  run(() => showModal("not-dismissable", {}));
+  Ember.run(() => showModal("not-dismissable", {}));
 
   assert.ok(find(".d-modal:visible").length === 1, "modal should appear");
 
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index 8c6d936e89..cb008f0323 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import componentTest from "helpers/component-test";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import formatTextWithSelection from "helpers/d-editor-helper";
@@ -748,7 +747,7 @@ composerTestCase("replace-text event for composer", async function(assert) {
         .lookup("service:app-events")
         .trigger("composer:replace-text", "green", "yellow", { forceFocus: true });
 
-      next(() => {
+      Ember.run.next(() => {
         let expect = formatTextWithSelection(AFTER, CASE.after);
         let actual = formatTextWithSelection(
           this.value,
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index 695a204291..f12da98666 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -1,5 +1,4 @@
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
 import Topic from "discourse/models/topic";
 import PostStream from "discourse/models/post-stream";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -546,7 +545,7 @@ QUnit.test(
     const done = assert.async();
     controller.send("deletePost", post);
 
-    next(() => {
+    Ember.run.next(() => {
       assert.ok(destroyed, "post was destroyed");
       done();
     });
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index ca1bd8363a..5e79f87647 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,5 +1,3 @@
-import { run } from "@ember/runloop";
-import { later } from "@ember/runloop";
 /* global QUnit, resetSite */
 
 import sessionFixtures from "fixtures/session-fixtures";
@@ -157,7 +155,7 @@ export function controllerFor(controller, model) {
 export function asyncTestDiscourse(text, func) {
   QUnit.test(text, function(assert) {
     const done = assert.async();
-    run(() => {
+    Ember.run(() => {
       func.call(this, assert);
       done();
     });
@@ -208,7 +206,7 @@ export function waitFor(assert, callback, timeout) {
   timeout = timeout || 500;
 
   const done = assert.async();
-  later(() => {
+  Ember.run.later(() => {
     callback();
     done();
   }, timeout);
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index a40e803bd2..d64823cd2a 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -1,4 +1,3 @@
-import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "helpers/qunit-helpers";
@@ -174,7 +173,7 @@ QUnit.skip("restores the href after a while", async assert => {
   assert.timeout(75);
 
   const done = assert.async();
-  later(() => {
+  Ember.run.later(() => {
     assert.equal(fixture("a").attr("href"), "http://www.google.com");
     done();
   });
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js.es6
index 429b669d7c..115417e4d4 100644
--- a/test/javascripts/models/nav-item-test.js.es6
+++ b/test/javascripts/models/nav-item-test.js.es6
@@ -1,9 +1,8 @@
-import { run } from "@ember/runloop";
 import createStore from "helpers/create-store";
 
 QUnit.module("Discourse.NavItem", {
   beforeEach() {
-    run(function() {
+    Ember.run(function() {
       const asianCategory = Discourse.Category.create({
         name: "确实是这样",
         id: 343434
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 1f1f15a0d4..5795795dc0 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -73,7 +73,8 @@ if (window.Logster) {
   window.Logster = { enabled: false };
 }
 
-var pretender = require("helpers/create-pretender", null, null, false),
+var origDebounce = Ember.run.debounce,
+  pretender = require("helpers/create-pretender", null, null, false),
   fixtures = require("fixtures/site-fixtures", null, null, false).default,
   flushMap = require("discourse/models/store", null, null, false).flushMap,
   ScrollingDOMMethods = require("discourse/mixins/scrolling", null, null, false)
@@ -136,9 +137,15 @@ QUnit.testStart(function(ctx) {
 
   // Unless we ever need to test this, let's leave it off.
   $.fn.autocomplete = function() {};
+
+  // Don't debounce in test unless we're testing debouncing
+  if (ctx.module.indexOf("debounce") === -1) {
+    Ember.run.debounce = Ember.run;
+  }
 });
 
 QUnit.testDone(function() {
+  Ember.run.debounce = origDebounce;
   window.sandbox.restore();
 
   // Destroy any modals
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6
index 4666285c27..fcb35f96b9 100644
--- a/test/javascripts/widgets/widget-test.js.es6
+++ b/test/javascripts/widgets/widget-test.js.es6
@@ -1,4 +1,3 @@
-import { next } from "@ember/runloop";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 import { createWidget } from "discourse/widgets/widget";
 import { withPluginApi } from "discourse/lib/plugin-api";
@@ -160,7 +159,7 @@ widgetTest("widget update with promise", {
 
       click() {
         return new Ember.RSVP.Promise(resolve => {
-          next(() => {
+          Ember.run.next(() => {
             this.state.name = "Robin";
             resolve();
           });

From c32bd8ae481b97a906f9f3834900f0ea66788ce9 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 30 Oct 2019 16:54:35 +1100
Subject: [PATCH 226/328] FEATURE: Remove attachments and truncate raw field
 for incoming emails (#8253)

Adds the settings:

raw_email_max_length, raw_rejected_email_max_length, delete_rejected_email_after_days.

These settings control retention of the "raw" emails logs.

raw_email_max_length ensures that if we get incoming email that is huge we will truncate it removing uploads from the raw log.

raw_rejected_email_max_length introduces an even more aggressive truncation for rejected incoming mail.

delete_rejected_email_after_days controls how many days we will keep rejected emails for (default 90)
---
 app/jobs/scheduled/weekly.rb          |  1 +
 config/locales/server.en.yml          |  3 ++
 config/site_settings.yml              |  3 ++
 lib/email/cleaner.rb                  | 42 +++++++++++++++++++++++++++
 lib/email/processor.rb                |  7 ++++-
 lib/email/receiver.rb                 |  3 +-
 lib/tasks/incoming_emails.rake        | 14 +++++++++
 spec/components/email/cleaner_spec.rb | 29 ++++++++++++++++++
 spec/tasks/incoming_emails_spec.rb    | 25 ++++++++++++++++
 9 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 lib/email/cleaner.rb
 create mode 100644 lib/tasks/incoming_emails.rake
 create mode 100644 spec/components/email/cleaner_spec.rb
 create mode 100644 spec/tasks/incoming_emails_spec.rb

diff --git a/app/jobs/scheduled/weekly.rb b/app/jobs/scheduled/weekly.rb
index 19895bfef6..164650e0e7 100644
--- a/app/jobs/scheduled/weekly.rb
+++ b/app/jobs/scheduled/weekly.rb
@@ -13,6 +13,7 @@ module Jobs
       Draft.cleanup!
       UserAuthToken.cleanup!
       Upload.reset_unknown_extensions!
+      Email::Cleaner.delete_rejected!
     end
   end
 end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d39d87b50a..9c5a9917e6 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1856,6 +1856,9 @@ en:
     private_email: "Don't include content from posts or topics in email title or email body. NOTE: also disables digest emails."
     email_total_attachment_size_limit_kb: "Max total size of files attached to outgoing emails. Set to 0 to disable sending of attachments."
     post_excerpts_in_emails: "In notification emails, always send excerpts instead of full posts"
+    raw_email_max_length: "How many characters should be stored for incoming email."
+    raw_rejected_email_max_length: "How many characters should be stored for rejected incoming email."
+    delete_rejected_email_after_days: "Delete rejected emails older than (n) days."
 
     manual_polling_enabled: "Push emails using the API for email replies."
     pop3_polling_enabled: "Poll via POP3 for email replies."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 61ba59496c..e6c1e16770 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1055,6 +1055,9 @@ email:
     default: 0
     max: 51200
   post_excerpts_in_emails: false
+  raw_email_max_length: 220000
+  raw_rejected_email_max_length: 4000
+  delete_rejected_email_after_days: 90
 
 files:
   max_image_size_kb:
diff --git a/lib/email/cleaner.rb b/lib/email/cleaner.rb
new file mode 100644
index 0000000000..52170a9659
--- /dev/null
+++ b/lib/email/cleaner.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Email
+  class Cleaner
+    def initialize(mail, remove_attachments: true, truncate: true, rejected: false)
+      @mail = Mail.new(mail)
+      @mail.charset = 'UTF-8'
+      @remove_attachments = remove_attachments
+      @truncate = truncate
+      @rejected = rejected
+    end
+
+    def execute
+      @mail.without_attachments! if @remove_attachments
+      truncate! if @truncate
+      remove_null_byte(@mail.to_s)
+    end
+
+    def self.delete_rejected!
+      IncomingEmail.delete_by('rejection_message IS NOT NULL AND created_at < ?', SiteSetting.delete_rejected_email_after_days.days.ago)
+    end
+
+    private
+
+    def truncate!
+      parts.each { |part| part.body = part.body.decoded.truncate(truncate_limit, omission: '') }
+    end
+
+    def parts
+      @mail.multipart? ? @mail.parts : [@mail]
+    end
+
+    def truncate_limit
+      @rejected ? SiteSetting.raw_rejected_email_max_length : SiteSetting.raw_email_max_length
+    end
+
+    def remove_null_byte(message)
+      message.gsub!("\x00", "")
+      message
+    end
+  end
+end
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 5b7cfaa930..a6ecec4ecc 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -128,7 +128,12 @@ module Email
     end
 
     def set_incoming_email_rejection_message(incoming_email, message)
-      incoming_email.update!(rejection_message: message) if incoming_email
+      if incoming_email
+        incoming_email.update!(
+          rejection_message: message,
+          raw: Email::Cleaner.new(incoming_email.raw, rejected: true).execute
+        )
+      end
     end
 
     def log_email_process_failure(mail_string, exception)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index eb78a0ef01..41035dc381 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -106,7 +106,7 @@ module Email
     def create_incoming_email
       IncomingEmail.create(
         message_id: @message_id,
-        raw: @raw_email,
+        raw: Email::Cleaner.new(@raw_email).execute,
         subject: subject,
         from_address: @from_email,
         to_addresses: @mail.to&.map(&:downcase)&.join(";"),
@@ -1237,5 +1237,4 @@ module Email
       end
     end
   end
-
 end
diff --git a/lib/tasks/incoming_emails.rake b/lib/tasks/incoming_emails.rake
new file mode 100644
index 0000000000..1ea94bb98f
--- /dev/null
+++ b/lib/tasks/incoming_emails.rake
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+desc "removes attachments and truncates long raw message"
+task "incoming_emails:truncate_long" => :environment do
+  IncomingEmail.find_each do |incoming_email|
+    truncated_raw = Email::Cleaner.new(incoming_email.raw, rejected: incoming_email.rejection_message.present?).execute
+
+    # raw email is using \n as line separator, mail gem is using \r\n
+    # we need to determine if anything change to avoid updating all records
+    changed = truncated_raw != Mail.new(incoming_email.raw).to_s
+
+    incoming_email.update(raw: truncated_raw) if changed
+  end
+end
diff --git a/spec/components/email/cleaner_spec.rb b/spec/components/email/cleaner_spec.rb
new file mode 100644
index 0000000000..16de564cd5
--- /dev/null
+++ b/spec/components/email/cleaner_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require "email/receiver"
+
+describe Email::Cleaner do
+  it 'removes attachments from raw message' do
+    email = email(:attached_txt_file)
+
+    expected_message = "Return-Path: <discourse@bar.com>\r\nDate: Sat, 30 Jan 2016 01:10:11 +0100\r\nFrom: Foo Bar <discourse@bar.com>\r\nTo: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com\r\nMessage-ID: <38@foo.bar.mail>\r\nMime-Version: 1.0\r\nContent-Type: multipart/mixed;\r\n boundary=\"--==_mimepart_56abff5d49749_ddf83fca6d033a28548ad\";\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\n\r\n----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPlease find some text file attached.\r\n----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad--\r\n"
+    expect(described_class.new(email).execute).to eq(expected_message)
+  end
+
+  it 'truncates message' do
+    email = email(:attached_txt_file)
+    SiteSetting.raw_email_max_length = 10
+
+    expected_message = "Return-Path: <discourse@bar.com>\r\nDate: Sat, 30 Jan 2016 01:10:11 +0100\r\nFrom: Foo Bar <discourse@bar.com>\r\nTo: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com\r\nMessage-ID: <38@foo.bar.mail>\r\nMime-Version: 1.0\r\nContent-Type: multipart/mixed;\r\n boundary=\"--==_mimepart_56abff5d49749_ddf83fca6d033a28548ad\";\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\n\r\n----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPlease fin\r\n----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad--\r\n"
+    expect(described_class.new(email).execute).to eq(expected_message)
+  end
+
+  it 'truncates rejected message' do
+    email = email(:attached_txt_file)
+    SiteSetting.raw_rejected_email_max_length = 10
+
+    expected_message = "Return-Path: <discourse@bar.com>\r\nDate: Sat, 30 Jan 2016 01:10:11 +0100\r\nFrom: Foo Bar <discourse@bar.com>\r\nTo: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com\r\nMessage-ID: <38@foo.bar.mail>\r\nMime-Version: 1.0\r\nContent-Type: multipart/mixed;\r\n boundary=\"--==_mimepart_56abff5d49749_ddf83fca6d033a28548ad\";\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\n\r\n----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPlease fin\r\n----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad--\r\n"
+    expect(described_class.new(email, rejected: true).execute).to eq(expected_message)
+  end
+end
diff --git a/spec/tasks/incoming_emails_spec.rb b/spec/tasks/incoming_emails_spec.rb
new file mode 100644
index 0000000000..40d266a774
--- /dev/null
+++ b/spec/tasks/incoming_emails_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe "incoming emails tasks" do
+  before do
+    Rake::Task.clear
+    Discourse::Application.load_tasks
+  end
+
+  describe 'email with attachment' do
+    fab!(:incoming_email) { Fabricate(:incoming_email, raw: email(:attached_txt_file)) }
+
+    it 'updates record' do
+      expect { Rake::Task['incoming_emails:truncate_long'].invoke }.to change { incoming_email.reload.raw }
+    end
+  end
+
+  describe 'short email without attachment' do
+    fab!(:incoming_email) { Fabricate(:incoming_email, raw: email(:html_reply)) }
+    it 'does not update record' do
+      expect { Rake::Task['incoming_emails:truncate_long'].invoke }.not_to change { incoming_email.reload.raw }
+    end
+  end
+end

From 2ae71b7a87b91b0ec3e729ac0778f58fcdf9c49e Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 30 Oct 2019 11:38:47 +0530
Subject: [PATCH 227/328] FEATURE: allow sending bulk invites to staged users

---
 app/jobs/regular/bulk_invite.rb |  2 +-
 app/models/invite.rb            |  2 +-
 spec/jobs/bulk_invite_spec.rb   | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index 8a5d248548..6baa2232d0 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -93,7 +93,7 @@ module Jobs
       topic = get_topic(invite[:topic_id])
 
       begin
-        if user = User.find_by_email(email)
+        if user = Invite.find_user_by_email(email)
           if groups.present?
             Group.transaction do
               groups.each do |group|
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 34ff75b282..597ef010d9 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -165,7 +165,7 @@ class Invite < ActiveRecord::Base
   end
 
   def self.find_user_by_email(email)
-    User.with_email(email).where(staged: false).first
+    User.with_email(Email.downcase(email)).where(staged: false).first
   end
 
   def self.get_group_ids(group_names)
diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb
index f25bf7812e..aad9f5ffe4 100644
--- a/spec/jobs/bulk_invite_spec.rb
+++ b/spec/jobs/bulk_invite_spec.rb
@@ -9,8 +9,9 @@ describe Jobs::BulkInvite do
     fab!(:group1) { Fabricate(:group, name: 'group1') }
     fab!(:group2) { Fabricate(:group, name: 'group2') }
     fab!(:topic) { Fabricate(:topic) }
+    let(:staged_user) { Fabricate(:user, staged: true, active: false) }
     let(:email) { "test@discourse.org" }
-    let(:invites) { [{ email: 'test2@discourse.org' }, { email: 'test@discourse.org', groups: 'GROUP1;group2', topic_id: topic.id }] }
+    let(:invites) { [{ email: staged_user.email }, { email: 'test2@discourse.org' }, { email: 'test@discourse.org', groups: 'GROUP1;group2', topic_id: topic.id }] }
 
     it 'raises an error when the invites array is missing' do
       expect { Jobs::BulkInvite.new.execute(current_user_id: user.id) }
@@ -28,15 +29,14 @@ describe Jobs::BulkInvite do
         invites: invites
       )
 
-      invite = Invite.last
-
-      expect(invite.email).to eq(email)
+      expect(Invite.exists?(email: staged_user.email)).to eq(true)
       expect(Invite.exists?(email: "test2@discourse.org")).to eq(true)
 
+      invite = Invite.last
+      expect(invite.email).to eq(email)
       expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(
         group1.id, group2.id
       )
-
       expect(invite.topic_invites.pluck(:topic_id)).to contain_exactly(topic.id)
     end
 
@@ -84,8 +84,9 @@ describe Jobs::BulkInvite do
           current_user_id: admin.id,
           invites: invites
         )
-      end.to change { Invite.count }.by(1)
+      end.to change { Invite.count }.by(2)
 
+      expect(Invite.exists?(email: staged_user.email)).to eq(true)
       expect(Invite.exists?(email: "test2@discourse.org")).to eq(true)
       expect(existing_user.reload.groups).to eq([group1])
     end

From 968a1419df9b93e484b080bd5bbae004146742ba Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 30 Oct 2019 16:32:48 +1000
Subject: [PATCH 228/328] FIX: Require q param in /tags/filter/search route
 (#8263)

* Require q param in /tags/filter/search route.
* If not provided this route was causing a 500 error when
  DiscourseTagging.clean_tag was called, because .downcase
  was being called on the param (which was nil).
* Now return a 400 error instead.
---
 app/controllers/tags_controller.rb    | 2 ++
 spec/requests/tags_controller_spec.rb | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 19629600ae..18a4f6e000 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -193,6 +193,8 @@ class TagsController < ::ApplicationController
   end
 
   def search
+    params.require(:q)
+
     clean_name = DiscourseTagging.clean_tag(params[:q])
     category = params[:categoryId] ? Category.find_by_id(params[:categoryId]) : nil
 
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 26bf959170..a68977112b 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -428,6 +428,15 @@ describe TagsController do
         json = ::JSON.parse(response.body)
         expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
       end
+
+      context 'when tag query parameter is not provided' do
+        it 'does not cause a 500 error, returns a param required message' do
+          get "/tags/filter/search.json", params: {}
+          expect(response.status).to eq(400)
+          json = ::JSON.parse(response.body)
+          expect(json['errors']).to include('param is missing or the value is empty: q')
+        end
+      end
     end
   end
 

From 92213813d402109ab9661b7ab725665948626ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 30 Oct 2019 10:37:18 +0100
Subject: [PATCH 229/328] Revert "FIX: Require q param in /tags/filter/search
 route (#8263)"

This reverts commit 968a1419df9b93e484b080bd5bbae004146742ba.
---
 app/controllers/tags_controller.rb    | 2 --
 spec/requests/tags_controller_spec.rb | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 18a4f6e000..19629600ae 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -193,8 +193,6 @@ class TagsController < ::ApplicationController
   end
 
   def search
-    params.require(:q)
-
     clean_name = DiscourseTagging.clean_tag(params[:q])
     category = params[:categoryId] ? Category.find_by_id(params[:categoryId]) : nil
 
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index a68977112b..26bf959170 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -428,15 +428,6 @@ describe TagsController do
         json = ::JSON.parse(response.body)
         expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
       end
-
-      context 'when tag query parameter is not provided' do
-        it 'does not cause a 500 error, returns a param required message' do
-          get "/tags/filter/search.json", params: {}
-          expect(response.status).to eq(400)
-          json = ::JSON.parse(response.body)
-          expect(json['errors']).to include('param is missing or the value is empty: q')
-        end
-      end
     end
   end
 

From 6a0e232dea746909b0689f72387768aa7a5f9aa2 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 30 Oct 2019 12:35:12 +0100
Subject: [PATCH 230/328] PERF: Add index to notifications to speed up moving
 of posts

---
 .../20191030112559_add_index_to_notifications.rb  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 db/migrate/20191030112559_add_index_to_notifications.rb

diff --git a/db/migrate/20191030112559_add_index_to_notifications.rb b/db/migrate/20191030112559_add_index_to_notifications.rb
new file mode 100644
index 0000000000..69d36d2f4d
--- /dev/null
+++ b/db/migrate/20191030112559_add_index_to_notifications.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddIndexToNotifications < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    if !index_exists?(:notifications, [:topic_id, :post_number])
+      add_index :notifications, [:topic_id, :post_number], algorithm: :concurrently
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From 8e6ad99e921a11357824049084f011eda73fec06 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 30 Oct 2019 12:59:59 +0100
Subject: [PATCH 231/328] DEV: Update annotations

---
 app/models/notification.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index b39fc97ac0..fa6bb66490 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -248,6 +248,7 @@ end
 #  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)

From 8d34f4bbd9d7b97c3ec1b179380138e546b9b94c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 30 Oct 2019 09:48:24 -0400
Subject: [PATCH 232/328] Revert "Revert Ember.run refactors"

This reverts commit fcb1ca52f96bdff1a49d558a4ffb18107d8334de.
---
 .../components/admin-backups-logs.js.es6      |  3 +-
 .../components/admin-report-chart.js.es6      |  8 ++--
 .../admin-report-stacked-chart.js.es6         |  8 ++--
 .../admin/components/admin-report.js.es6      |  3 +-
 .../components/admin-theme-editor.js.es6      |  3 +-
 .../components/admin-user-field-item.js.es6   |  3 +-
 .../admin/components/color-input.js.es6       |  5 ++-
 .../admin/components/embeddable-host.js.es6   |  3 +-
 .../admin/components/ip-lookup.js.es6         |  3 +-
 .../components/penalty-post-action.js.es6     |  3 +-
 .../admin/components/permalink-form.js.es6    |  5 ++-
 .../admin/components/resumable-upload.js.es6  | 16 ++++----
 .../screened-ip-address-form.js.es6           |  5 ++-
 .../admin/components/themes-list-item.js.es6  |  3 +-
 .../admin/components/watched-word-form.js.es6 |  5 ++-
 .../admin-customize-colors-show.js.es6        |  3 +-
 .../admin-dashboard-reports.js.es6            |  3 +-
 .../admin-logs-staff-action-logs.js.es6       |  3 +-
 .../controllers/admin-site-text-index.js.es6  |  5 ++-
 .../controllers/admin-user-badges.js.es6      |  3 +-
 .../admin-watched-words-action.js.es6         |  3 +-
 .../lib/buffered-render.js.es6                |  3 +-
 .../mixins/focus-event.js.es6                 |  3 +-
 app/assets/javascripts/discourse-loader.js    | 18 +++++++++
 .../add-category-tag-classes.js.es6           |  3 +-
 .../components/choose-message.js.es6          |  5 +--
 .../discourse/components/choose-topic.js.es6  |  3 +-
 .../discourse/components/composer-body.js.es6 | 15 ++++---
 .../components/composer-editor.js.es6         | 39 +++++++++----------
 .../components/composer-messages.js.es6       |  3 +-
 .../components/composer-title.js.es6          | 13 ++++---
 .../components/composer-user-selector.js.es6  |  3 +-
 .../discourse/components/cook-text.js.es6     |  3 +-
 .../discourse/components/d-editor.js.es6      | 26 +++++++------
 .../discourse/components/d-modal-body.js.es6  |  3 +-
 .../discourse/components/d-modal.js.es6       |  5 ++-
 .../discourse/components/date-input.js.es6    |  3 +-
 .../discourse/components/date-picker.js.es6   |  3 +-
 .../components/discourse-topic.js.es6         | 12 ++++--
 .../components/discovery-topics-list.js.es6   | 10 ++---
 .../components/edit-category-tab.js.es6       |  3 +-
 .../edit-category-topic-template.js.es6       |  3 +-
 .../components/edit-topic-timer-form.js.es6   |  3 +-
 .../components/expanding-text-area.js.es6     |  3 +-
 .../components/flag-selection.js.es6          |  3 +-
 .../discourse/components/footer-nav.js.es6    |  3 +-
 .../discourse/components/global-notice.js.es6 |  8 ++--
 .../components/group-flair-inputs.js.es6      |  3 +-
 .../components/image-uploader.js.es6          |  5 ++-
 .../discourse/components/link-to-input.js.es6 |  3 +-
 .../discourse/components/login-modal.js.es6   |  3 +-
 .../discourse/components/mobile-nav.js.es6    |  5 ++-
 .../discourse/components/mount-widget.js.es6  | 10 +++--
 .../components/navigation-bar.js.es6          |  5 ++-
 .../components/pwa-install-banner.js.es6      |  6 +--
 .../discourse/components/quote-button.js.es6  |  3 +-
 .../components/scroll-tracker.js.es6          |  3 +-
 .../components/scrolling-post-stream.js.es6   | 12 +++---
 .../components/search-advanced-options.js.es6 |  6 ++-
 .../discourse/components/share-panel.js.es6   |  3 +-
 .../discourse/components/share-popup.js.es6   | 10 +++--
 .../discourse/components/signup-cta.js.es6    |  6 +--
 .../discourse/components/site-header.js.es6   |  9 +++--
 .../discourse/components/text-overflow.js.es6 |  3 +-
 .../discourse/components/time-input.js.es6    |  3 +-
 .../components/topic-entrance.js.es6          |  3 +-
 .../discourse/components/topic-list.js.es6    |  5 +--
 .../components/topic-navigation.js.es6        | 10 +++--
 .../components/topic-progress.js.es6          | 14 +++----
 .../components/topic-timeline.js.es6          |  3 +-
 .../components/topic-timer-info.js.es6        | 10 ++---
 .../discourse/components/user-stream.js.es6   |  3 +-
 .../discourse/controllers/auth-token.js.es6   |  3 +-
 .../discourse/controllers/change-owner.js.es6 |  3 +-
 .../controllers/change-timestamp.js.es6       |  3 +-
 .../discourse/controllers/composer.js.es6     |  3 +-
 .../discourse/controllers/exception.js.es6    |  3 +-
 .../controllers/insert-hyperlink.js.es6       |  9 +++--
 .../discourse/controllers/jump-to-post.js.es6 |  3 +-
 .../discourse/controllers/login.js.es6        |  6 ++-
 .../controllers/move-to-topic.js.es6          |  3 +-
 .../second-factor-backup-edit.js.es6          |  3 +-
 .../discourse/controllers/topic.js.es6        |  6 ++-
 .../initializers/asset-version.js.es6         |  3 +-
 .../initializers/auth-complete.js.es6         |  3 +-
 .../discourse/initializers/mobile.js.es6      |  3 +-
 .../javascripts/discourse/lib/ajax.js.es6     |  7 ++--
 .../discourse/lib/autocomplete.js.es6         | 10 +++--
 .../discourse/lib/clean-dom.js.es6            |  3 +-
 .../discourse/lib/click-track.js.es6          |  3 +-
 .../javascripts/discourse/lib/debounce.js.es6 |  3 +-
 .../lib/desktop-notifications.js.es6          |  5 ++-
 .../discourse/lib/keyboard-shortcuts.js.es6   |  8 ++--
 .../lib/link-category-hashtags.js.es6         |  3 +-
 .../discourse/lib/link-mentions.js.es6        |  3 +-
 .../discourse/lib/link-tag-hashtag.js.es6     |  3 +-
 .../discourse/lib/load-script.js.es6          |  3 +-
 .../discourse/lib/page-tracker.js.es6         |  3 +-
 .../discourse/lib/safari-hacks.js.es6         |  6 +--
 .../discourse/lib/screen-track.js.es6         |  3 +-
 .../javascripts/discourse/lib/throttle.js.es6 |  3 +-
 .../javascripts/discourse/lib/url.js.es6      | 10 +++--
 .../mixins/card-contents-base.js.es6          |  9 +++--
 .../discourse/mixins/docking.js.es6           |  3 +-
 .../mixins/mobile-scroll-direction.js.es6     |  3 +-
 .../discourse/mixins/scroll-top.js.es6        |  3 +-
 .../discourse/mixins/scrolling.js.es6         |  3 +-
 .../discourse/models/composer.js.es6          |  9 +++--
 .../discourse/routes/application.js.es6       |  6 ++-
 .../discourse/routes/associate-account.js.es6 |  3 +-
 .../discourse/routes/discourse.js.es6         |  3 +-
 .../routes/discovery-categories.js.es6        |  5 +--
 .../discourse/routes/forgot-password.js.es6   |  3 +-
 .../javascripts/discourse/routes/login.js.es6 |  3 +-
 .../discourse/routes/new-message.js.es6       |  5 ++-
 .../discourse/routes/new-topic.js.es6         |  3 +-
 .../discourse/routes/signup.js.es6            |  5 ++-
 .../discourse/routes/topic-from-params.js.es6 |  3 +-
 .../javascripts/discourse/routes/topic.js.es6 | 13 ++++---
 .../widgets/component-connector.js.es6        |  3 +-
 .../discourse/widgets/connector.js.es6        |  3 +-
 .../javascripts/discourse/widgets/glue.js.es6 |  8 ++--
 .../discourse/widgets/hamburger-menu.js.es6   |  3 +-
 .../discourse/widgets/header.js.es6           |  3 +-
 .../discourse/widgets/post-menu.js.es6        |  6 ++-
 .../discourse/widgets/post-stream.js.es6      |  3 +-
 .../discourse/widgets/search-menu.js.es6      |  6 ++-
 .../discourse/widgets/topic-timeline.js.es6   |  3 +-
 .../discourse/widgets/user-menu.js.es6        |  3 +-
 .../javascripts/pretty-text/oneboxer.js.es6   |  5 ++-
 .../pretty-text/upload-short-url.js.es6       |  3 +-
 .../select-kit/mixins/dom-helpers.js.es6      | 14 ++++---
 .../select-kit/mixins/events.js.es6           |  8 ++--
 .../wizard/components/invite-list.js.es6      |  3 +-
 .../wizard/components/radio-button.js.es6     |  3 +-
 .../wizard/components/wizard-step.js.es6      |  5 ++-
 app/assets/javascripts/wizard/lib/ajax.js.es6 |  5 ++-
 .../javascripts/wizard/lib/preview.js.es6     |  3 +-
 .../wizard/test/acceptance/wizard-test.js.es6 |  3 +-
 .../wizard/test/helpers/start-app.js.es6      |  3 +-
 lib/pretty_text.rb                            |  1 +
 .../discourse-local-dates-create-form.js.es6  |  7 ++--
 .../composer-presence-display.js.es6          | 13 ++++---
 .../components/topic-presence-display.js.es6  |  6 ++-
 .../acceptance/composer-test.js.es6           |  3 +-
 test/javascripts/acceptance/modal-test.js.es6 |  3 +-
 .../components/d-editor-test.js.es6           |  3 +-
 .../javascripts/controllers/topic-test.js.es6 |  3 +-
 test/javascripts/helpers/qunit-helpers.js.es6 |  6 ++-
 test/javascripts/lib/click-track-test.js.es6  |  3 +-
 test/javascripts/models/nav-item-test.js.es6  |  3 +-
 test/javascripts/test_helper.js               |  9 +----
 test/javascripts/widgets/widget-test.js.es6   |  3 +-
 153 files changed, 493 insertions(+), 319 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
index 67bc308948..ccacb2e705 100644
--- a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { renderSpinner } from "discourse/helpers/loading-spinner";
@@ -53,7 +54,7 @@ export default Component.extend(
       // force rerender
       this.rerenderBuffer();
 
-      Ember.run.scheduleOnce("afterRender", this, this._scrollDown);
+      scheduleOnce("afterRender", this, this._scrollDown);
     }, 150),
 
     buildBuffer(buffer) {
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 6ad48208b4..1f23998d6b 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
@@ -11,7 +13,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      Ember.run.debounce(this, this._scheduleChartRendering, 500);
+      debounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -31,11 +33,11 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    Ember.run.debounce(this, this._scheduleChartRendering, 100);
+    debounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this._renderChart(
         this.model,
         this.element && this.element.querySelector(".chart-canvas")
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 1d70da8fed..77604527ed 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,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
@@ -9,7 +11,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      Ember.run.debounce(this, this._scheduleChartRendering, 500);
+      debounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -29,11 +31,11 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    Ember.run.debounce(this, this._scheduleChartRendering, 100);
+    debounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       if (!this.element) {
         return;
       }
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 4efdf09926..5b3fbdd9a5 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
@@ -313,7 +314,7 @@ export default Component.extend({
 
     this.setProperties({ isLoading: true, rateLimitationString: null });
 
-    Ember.run.next(() => {
+    next(() => {
       let payload = this._buildPayload(["prev_period"]);
 
       const callback = response => {
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
index 8120456821..1dec9fce37 100644
--- a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
+++ b/app/assets/javascripts/admin/components/admin-theme-editor.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
@@ -83,7 +84,7 @@ export default Component.extend({
 
     toggleMaximize: function() {
       this.toggleProperty("maximized");
-      Ember.run.next(() => this.appEvents.trigger("ace:resize"));
+      next(() => this.appEvents.trigger("ace:resize"));
     },
 
     onlyOverriddenChanged(value) {
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.es6
index 7b6cef4527..f186b291f1 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import UserField from "admin/models/user-field";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -28,7 +29,7 @@ export default Component.extend(bufferedProperty("userField"), {
   @observes("editing")
   _focusOnEdit() {
     if (this.editing) {
-      Ember.run.scheduleOnce("afterRender", this, "_focusName");
+      scheduleOnce("afterRender", this, "_focusName");
     }
   },
 
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index f6f0025354..6c02f78dd5 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as loadScript, loadCSS } from "discourse/lib/load-script";
 
@@ -37,7 +38,7 @@ export default Component.extend({
   didInsertElement() {
     loadScript("/javascripts/spectrum.js").then(() => {
       loadCSS("/javascripts/spectrum.css").then(() => {
-        Ember.run.schedule("afterRender", () => {
+        schedule("afterRender", () => {
           $(this.element.querySelector(".picker"))
             .spectrum({ color: "#" + this.hexValue })
             .on("change.spectrum", (me, color) => {
@@ -47,7 +48,7 @@ export default Component.extend({
         });
       });
     });
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.hexValueChanged();
     });
   }
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index 746bfeede3..debb6b25b1 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
@@ -14,7 +15,7 @@ export default Component.extend(bufferedProperty("host"), {
   @on("didInsertElement")
   @observes("editing")
   _focusOnInput() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.element.querySelector(".host-name").focus();
     });
   },
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index f97deff711..8438a4ee5c 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
@@ -78,7 +79,7 @@ export default Component.extend({
       $(document.body).append($copyRange);
       if (copyText(text, $copyRange[0])) {
         this.set("copied", true);
-        Ember.run.later(() => this.set("copied", false), 2000);
+        later(() => this.set("copied", false), 2000);
       }
       $copyRange.remove();
     },
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index dcb3bd3ba5..7fefa0f3e5 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -23,7 +24,7 @@ export default Component.extend({
 
       // If we switch to edit mode, jump to the edit textarea
       if (postAction === "edit") {
-        Ember.run.scheduleOnce("afterRender", () => {
+        scheduleOnce("afterRender", () => {
           let elem = this.element;
           let body = elem.closest(".modal-body");
           body.scrollTop(body.height());
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 74efe085d9..b1f82ea295 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
@@ -20,7 +21,7 @@ export default Component.extend({
   },
 
   focusPermalink() {
-    Ember.run.schedule("afterRender", () =>
+    schedule("afterRender", () =>
       this.element.querySelector(".permalink-url").focus()
     );
   },
@@ -69,7 +70,7 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element.querySelector(".external-url")).keydown(e => {
         // enter key
         if (e.keyCode === 13) {
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 8f6a291325..d63a1a651d 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,5 @@
+import { schedule } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -45,18 +47,16 @@ export default Component.extend(
         this.resumable.upload();
 
         // mark as uploading
-        Ember.run.later(() => this.set("isUploading", true));
+        later(() => this.set("isUploading", true));
       });
 
       this.resumable.on("fileProgress", file => {
         // update progress
-        Ember.run.later(() =>
-          this.set("progress", parseInt(file.progress() * 100, 10))
-        );
+        later(() => this.set("progress", parseInt(file.progress() * 100, 10)));
       });
 
       this.resumable.on("fileSuccess", file => {
-        Ember.run.later(() => {
+        later(() => {
           // mark as not uploading anymore
           this._reset();
 
@@ -66,7 +66,7 @@ export default Component.extend(
       });
 
       this.resumable.on("fileError", (file, message) => {
-        Ember.run.later(() => {
+        later(() => {
           // mark as not uploading anymore
           this._reset();
 
@@ -78,7 +78,7 @@ export default Component.extend(
 
     @on("didInsertElement")
     _assignBrowse() {
-      Ember.run.schedule("afterRender", () =>
+      schedule("afterRender", () =>
         this.resumable.assignBrowse($(this.element))
       );
     },
@@ -117,7 +117,7 @@ export default Component.extend(
     click() {
       if (this.isUploading) {
         this.resumable.cancel();
-        Ember.run.later(() => this._reset());
+        later(() => this._reset());
         return false;
       } else {
         return true;
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.es6
index 1b20d7f39c..8b6db57764 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /**
   A form to create an IP address that will be blocked or whitelisted.
@@ -62,7 +63,7 @@ export default Component.extend({
           .then(result => {
             this.setProperties({ ip_address: "", formSubmitted: false });
             this.action(ScreenedIpAddress.create(result.screened_ip_address));
-            Ember.run.schedule("afterRender", () =>
+            schedule("afterRender", () =>
               this.element.querySelector(".ip-address-input").focus()
             );
           })
@@ -84,7 +85,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _init() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element.querySelector(".ip-address-input")).keydown(e => {
         if (e.keyCode === 13) {
           this.send("submit");
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 62e5dff884..6d68f4d8e3 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -33,7 +34,7 @@ export default Component.extend({
   },
 
   scheduleAnimation() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.animate(true);
     });
   },
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index 919f6de9ef..74bbeeff1e 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import WatchedWord from "admin/models/watched-word";
 import {
@@ -64,7 +65,7 @@ export default Component.extend({
               message: I18n.t("admin.watched_words.form.success")
             });
             this.action(WatchedWord.create(result));
-            Ember.run.schedule("afterRender", () =>
+            schedule("afterRender", () =>
               this.element.querySelector(".watched-word-input").focus()
             );
           })
@@ -86,7 +87,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _init() {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element.querySelector(".watched-word-input")).keydown(e => {
         if (e.keyCode === 13) {
           this.send("submit");
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.es6
index df5d71d3de..ce99c2cfea 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -41,7 +42,7 @@ export default Controller.extend({
         );
       }
 
-      Ember.run.later(() => {
+      later(() => {
         this.set("model.savingStatus", null);
       }, 2000);
 
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 12cc0400f1..b582f733aa 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 const { get } = Ember;
@@ -21,7 +22,7 @@ export default Controller.extend({
 
   actions: {
     filterReports(filter) {
-      Ember.run.debounce(this, this._performFiltering, filter, 250);
+      debounce(this, this._performFiltering, filter, 250);
     }
   },
 
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.es6
index da3afb72c5..65df52b7f6 100644
--- 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.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
@@ -68,7 +69,7 @@ export default Controller.extend({
   },
 
   scheduleRefresh() {
-    Ember.run.scheduleOnce("afterRender", this, this._refresh);
+    scheduleOnce("afterRender", this, this._refresh);
   },
 
   actions: {
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.es6
index 15a16be72b..1a1b266ae1 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
 let lastSearch;
 
@@ -27,14 +28,14 @@ export default Controller.extend({
     toggleOverridden() {
       this.toggleProperty("overridden");
       this.set("searching", true);
-      Ember.run.debounce(this, this._performSearch, 400);
+      debounce(this, this._performSearch, 400);
     },
 
     search() {
       const q = this.q;
       if (q !== lastSearch) {
         this.set("searching", true);
-        Ember.run.debounce(this, this._performSearch, 400);
+        debounce(this, this._performSearch, 400);
         lastSearch = q;
       }
     }
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 51f1787fe0..eed2c23ec4 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
@@ -71,7 +72,7 @@ export default Controller.extend(GrantBadgeController, {
       ).then(
         () => {
           this.set("badgeReason", "");
-          Ember.run.next(() => {
+          next(() => {
             // Update the selected badge ID after the combobox has re-rendered.
             const newSelectedBadge = this.grantableBadges[0];
             if (newSelectedBadge) {
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 be982921db..4435eb9b25 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,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
@@ -51,7 +52,7 @@ export default Controller.extend({
       if (a) {
         a.words.unshiftObject(arg);
         a.incrementProperty("count");
-        Ember.run.schedule("afterRender", () => {
+        schedule("afterRender", () => {
           // remove from other actions lists
           let match = null;
           this.get("adminWatchedWords.model").forEach(action => {
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
index 8e23ba55ee..d3d301212a 100644
--- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 // Ember 2.0 removes buffered rendering, but we can still implement it ourselves.
 // In the long term we'll want to remove this.
 
@@ -13,7 +14,7 @@ const Mixin = {
   },
 
   rerenderBuffer() {
-    Ember.run.scheduleOnce("render", this, this._customRender);
+    scheduleOnce("render", this, this._customRender);
   }
 };
 
diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
index 3f70e353b8..974d73c958 100644
--- a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
+++ b/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
@@ -1,10 +1,11 @@
+import { bind } from "@ember/runloop";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Mixin.create({
   ready() {
     this._super(...arguments);
 
-    this._onChangeHandler = Ember.run.bind(this, this._onChange);
+    this._onChangeHandler = bind(this, this._onChange);
 
     // Default to true
     Discourse.set("hasFocus", true);
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 1762d116aa..68128b1f6a 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -14,11 +14,29 @@ var define, requirejs;
       "@ember/object": { default: Ember.Object },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
       "@ember/routing/route": { default: Ember.Route },
+      "@ember/runloop": {
+        bind: Ember.run.bind,
+        cancel: Ember.run.cancel,
+        debounce: Ember.testing ? Ember.run : Ember.run.debounce,
+        later: Ember.run.later,
+        next: Ember.run.next,
+        once: Ember.run.once,
+        run: Ember.run,
+        schedule: Ember.run.schedule,
+        scheduleOnce: Ember.run.scheduleOnce,
+        throttle: Ember.run.throttle
+      },
       "@ember/service": {
         default: Ember.Service,
         inject: Ember.inject.service
       }
     };
+  } else if (typeof __PRETTY_TEXT !== "undefined") {
+    // This is a hack because our server side code includes the pretty_text bundle
+    // which relies on ember now that we're using modules properly.
+    // The proper fix would be to move the upload urls code out of the pretty text
+    // bundle and remove this code. It should never be called;
+    EMBER_MODULES["@ember/runloop"] = {};
   }
 
   var _isArray;
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.es6
index 209367e829..d4a75e6ebe 100644
--- a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
+++ b/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
@@ -26,7 +27,7 @@ export default Component.extend({
 
   @observes("category.fullSlug", "tags")
   refreshClass() {
-    Ember.run.scheduleOnce("afterRender", this, this._updateClass);
+    scheduleOnce("afterRender", this, this._updateClass);
   },
 
   _removeClass() {
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index b4518c2c4f..be174ad685 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
@@ -57,9 +58,7 @@ export default Component.extend({
     chooseMessage(message) {
       const messageId = Ember.get(message, "id");
       this.set("selectedTopicId", messageId);
-      Ember.run.next(() =>
-        $(`#choose-message-${messageId}`).prop("checked", "true")
-      );
+      next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index df0d3b1c47..a31aa5eee4 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { searchForTerm } from "discourse/lib/search";
@@ -62,7 +63,7 @@ export default Component.extend({
   actions: {
     chooseTopic(topic) {
       this.set("selectedTopicId", topic.id);
-      Ember.run.next(() => {
+      next(() => {
         document.getElementById(`choose-topic-${topic.id}`).checked = true;
       });
       return false;
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index 7fea43389d..f265917279 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -1,3 +1,8 @@
+import { throttle } from "@ember/runloop";
+import { run } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -60,7 +65,7 @@ export default Component.extend(KeyEnterEscape, {
     "composer.canEditTopicFeaturedLink"
   )
   resize() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       if (!this.element || this.isDestroying || this.isDestroyed) {
         return;
       }
@@ -78,8 +83,8 @@ export default Component.extend(KeyEnterEscape, {
 
     // One second from now, check to see if the last key was hit when
     // we recorded it. If it was, the user paused typing.
-    Ember.run.cancel(this._lastKeyTimeout);
-    this._lastKeyTimeout = Ember.run.later(() => {
+    cancel(this._lastKeyTimeout);
+    this._lastKeyTimeout = later(() => {
       if (lastKeyUp !== this._lastKeyUp) {
         return;
       }
@@ -116,7 +121,7 @@ export default Component.extend(KeyEnterEscape, {
 
     const throttledPerformDrag = (event => {
       event.preventDefault();
-      Ember.run.throttle(this, performDrag, event, THROTTLE_RATE);
+      throttle(this, performDrag, event, THROTTLE_RATE);
     }).bind(this);
 
     const endDrag = () => {
@@ -153,7 +158,7 @@ export default Component.extend(KeyEnterEscape, {
     this._super(...arguments);
     this.setupComposerResizeEvents();
 
-    const resize = () => Ember.run(() => this.resize());
+    const resize = () => run(() => this.resize());
     const triggerOpen = () => {
       if (this.get("composer.composeState") === Composer.OPEN) {
         this.appEvents.trigger("composer:opened");
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index cc419e1af9..8042d248da 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,3 +1,8 @@
+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 Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import {
@@ -183,7 +188,7 @@ export default Component.extend({
         transformComplete: v => v.username || v.name,
         afterComplete() {
           // ensures textarea scroll position is correct
-          Ember.run.scheduleOnce("afterRender", () => $input.blur().focus());
+          scheduleOnce("afterRender", () => $input.blur().focus());
         }
       });
     }
@@ -192,13 +197,7 @@ export default Component.extend({
       this._initInputPreviewSync($input, $preview);
     } else {
       $input.on("scroll", () =>
-        Ember.run.throttle(
-          this,
-          this._syncEditorAndPreviewScroll,
-          $input,
-          $preview,
-          20
-        )
+        throttle(this, this._syncEditorAndPreviewScroll, $input, $preview, 20)
       );
     }
 
@@ -316,7 +315,7 @@ export default Component.extend({
       this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
     });
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       $input.on("touchstart mouseenter", () => {
         if (!$preview.is(":visible")) return;
         $preview.off("scroll");
@@ -342,7 +341,7 @@ export default Component.extend({
       this.set("shouldBuildScrollMap", false);
     }
 
-    Ember.run.throttle(this, $callback, $input, $preview, this.scrollMap, 20);
+    throttle(this, $callback, $input, $preview, this.scrollMap, 20);
   },
 
   _teardownInputPreviewSync() {
@@ -559,7 +558,7 @@ export default Component.extend({
   },
 
   _warnMentionedGroups($preview) {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       var found = this.warnedGroupMentions || [];
       $preview.find(".mention-group.notify").each((idx, e) => {
         const $e = $(e);
@@ -587,7 +586,7 @@ export default Component.extend({
       return;
     }
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       let found = this.warnedCannotSeeMentions || [];
 
       $preview.find(".mention.cannot-see").each((idx, e) => {
@@ -597,7 +596,7 @@ export default Component.extend({
         if (found.indexOf(name) === -1) {
           // add a delay to allow for typing, so you don't open the warning right away
           // previously we would warn after @bob even if you were about to mention @bob2
-          Ember.run.later(
+          later(
             this,
             () => {
               if (
@@ -618,7 +617,7 @@ export default Component.extend({
   },
 
   _resetUpload(removePlaceholder) {
-    Ember.run.next(() => {
+    next(() => {
       if (this._validUploads > 0) {
         this._validUploads--;
       }
@@ -897,9 +896,9 @@ export default Component.extend({
   @on("willDestroyElement")
   _composerClosed() {
     this.appEvents.trigger("composer:will-close");
-    Ember.run.next(() => {
+    next(() => {
       // need to wait a bit for the "slide down" transition of the composer
-      Ember.run.later(
+      later(
         () => this.appEvents.trigger("composer:closed"),
         Ember.testing ? 0 : 400
       );
@@ -970,7 +969,7 @@ export default Component.extend({
       // Paint mentions
       const unseenMentions = linkSeenMentions($preview, this.siteSettings);
       if (unseenMentions.length) {
-        Ember.run.debounce(
+        debounce(
           this,
           this._renderUnseenMentions,
           $preview,
@@ -985,7 +984,7 @@ export default Component.extend({
       // Paint category hashtags
       const unseenCategoryHashtags = linkSeenCategoryHashtags($preview);
       if (unseenCategoryHashtags.length) {
-        Ember.run.debounce(
+        debounce(
           this,
           this._renderUnseenCategoryHashtags,
           $preview,
@@ -998,7 +997,7 @@ export default Component.extend({
       if (this.siteSettings.tagging_enabled) {
         const unseenTagHashtags = linkSeenTagHashtags($preview);
         if (unseenTagHashtags.length) {
-          Ember.run.debounce(
+          debounce(
             this,
             this._renderUnseenTagHashtags,
             $preview,
@@ -1009,7 +1008,7 @@ export default Component.extend({
       }
 
       // Paint oneboxes
-      Ember.run.debounce(
+      debounce(
         this,
         () => {
           const oneboxes = {};
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index fb07997b80..82a4fceeaf 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import LinkLookup from "discourse/lib/link-lookup";
 
@@ -24,7 +25,7 @@ export default Component.extend({
     this.appEvents.on("composer:find-similar", this, this._findSimilar);
     this.appEvents.on("composer-messages:close", this, this._closeTop);
     this.appEvents.on("composer-messages:create", this, this._create);
-    Ember.run.scheduleOnce("afterRender", this, this.reset);
+    scheduleOnce("afterRender", this, this.reset);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 459d1bd0a6..540f1b36eb 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,3 +1,6 @@
+import { next } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -24,7 +27,7 @@ export default Component.extend({
     }
 
     if (this.get("composer.titleLength") > 0) {
-      Ember.run.debounce(this, this._titleChanged, 10);
+      debounce(this, this._titleChanged, 10);
     }
   },
 
@@ -79,13 +82,13 @@ export default Component.extend({
     }
 
     if (Ember.testing) {
-      Ember.run.next(() =>
+      next(() =>
         // not ideal but we don't want to run this in current
         // runloop to avoid an error in console
         this._checkForUrl()
       );
     } else {
-      Ember.run.debounce(this, this._checkForUrl, 500);
+      debounce(this, this._checkForUrl, 500);
     }
   },
 
@@ -134,14 +137,14 @@ export default Component.extend({
           })
           .finally(() => {
             this.set("composer.loading", false);
-            Ember.run.schedule("afterRender", () => {
+            schedule("afterRender", () => {
               $(this.element.querySelector("input")).putCursorAtEnd();
             });
           });
       } else {
         this._updatePost(loadOnebox);
         this.set("composer.loading", false);
-        Ember.run.schedule("afterRender", () => {
+        schedule("afterRender", () => {
           $(this.element.querySelector("input")).putCursorAtEnd();
         });
       }
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
index 694db1cfd3..3e9aa03784 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -76,7 +77,7 @@ export default Component.extend({
     toggleSelector() {
       this.set("showSelector", true);
 
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         $(this.element)
           .find("input")
           .focus();
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index e9e19b338f..256636a3c5 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { cookAsync } from "discourse/lib/text";
 import { ajax } from "discourse/lib/ajax";
@@ -12,7 +13,7 @@ const CookText = Component.extend({
       this.set("cooked", cooked);
       // no choice but to defer this cause
       // pretty text may only be loaded now
-      Ember.run.next(() =>
+      next(() =>
         window
           .requireModule("pretty-text/upload-short-url")
           .resolveAllShortUrls(ajax)
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 185223be34..e839fad6c6 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,3 +1,8 @@
+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 { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /*global Mousetrap:true */
@@ -249,7 +254,7 @@ export default Component.extend({
     this._applyEmojiAutocomplete($editorInput);
     this._applyCategoryHashtagAutocomplete($editorInput);
 
-    Ember.run.scheduleOnce("afterRender", this, this._readyNow);
+    scheduleOnce("afterRender", this, this._readyNow);
 
     const mouseTrap = Mousetrap(this.element.querySelector(".d-editor-input"));
     const shortcuts = this.get("toolbar.shortcuts");
@@ -348,7 +353,7 @@ export default Component.extend({
         return;
       }
       this.set("preview", cooked);
-      Ember.run.scheduleOnce("afterRender", () => {
+      scheduleOnce("afterRender", () => {
         if (this._state !== "inDOM") {
           return;
         }
@@ -372,7 +377,7 @@ export default Component.extend({
     if (Ember.testing) {
       this._updatePreview();
     } else {
-      Ember.run.debounce(this, this._updatePreview, 30);
+      debounce(this, this._updatePreview, 30);
     }
   },
 
@@ -432,17 +437,14 @@ export default Component.extend({
             emojiPickerIsActive: true
           });
 
-          Ember.run.schedule("afterRender", () => {
+          schedule("afterRender", () => {
             const filterInput = document.querySelector(
               ".emoji-picker input[name='filter']"
             );
             if (filterInput) {
               filterInput.value = v.term;
 
-              Ember.run.later(
-                () => filterInput.dispatchEvent(new Event("input")),
-                50
-              );
+              later(() => filterInput.dispatchEvent(new Event("input")), 50);
             }
           });
 
@@ -547,7 +549,7 @@ export default Component.extend({
   },
 
   _selectText(from, length) {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       const textarea = this.element.querySelector("textarea.d-editor-input");
       const $textarea = $(textarea);
       const oldScrollPos = $textarea.scrollTop();
@@ -556,7 +558,7 @@ export default Component.extend({
       }
       textarea.selectionStart = from;
       textarea.selectionEnd = from + length;
-      Ember.run.next(() => $textarea.trigger("change"));
+      next(() => $textarea.trigger("change"));
       $textarea.scrollTop(oldScrollPos);
     });
   },
@@ -785,7 +787,7 @@ export default Component.extend({
     $textarea.val(value);
     $textarea.prop("selectionStart", insert.length);
     $textarea.prop("selectionEnd", insert.length);
-    Ember.run.next(() => $textarea.trigger("change"));
+    next(() => $textarea.trigger("change"));
     this._focusTextArea();
   },
 
@@ -886,7 +888,7 @@ export default Component.extend({
   // ensures textarea scroll position is correct
   _focusTextArea() {
     const textarea = this.element.querySelector("textarea.d-editor-input");
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       textarea.blur();
       textarea.focus();
     });
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 33b444d05b..a8543095ab 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   classNames: ["modal-body"],
@@ -14,7 +15,7 @@ export default Component.extend({
       fixedParent.modal("show");
     }
 
-    Ember.run.scheduleOnce("afterRender", this, this._afterFirstRender);
+    scheduleOnce("afterRender", this, this._afterFirstRender);
     this.appEvents.on("modal-body:flash", this, "_flash");
     this.appEvents.on("modal-body:clearFlash", this, "_clearFlash");
   },
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 0c83f529ad..19d4d2264c 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 import Component from "@ember/component";
 
@@ -32,11 +33,11 @@ export default Component.extend({
   setUp() {
     $("html").on("keydown.discourse-modal", e => {
       if (e.which === 27 && this.dismissable) {
-        Ember.run.next(() => $(".modal-header button.modal-close").click());
+        next(() => $(".modal-header button.modal-close").click());
       }
 
       if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        Ember.run.next(() => $(".modal-footer .btn-primary").click());
+        next(() => $(".modal-footer .btn-primary").click());
       }
     });
 
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js.es6
index 0161fb8aa2..927be37881 100644
--- a/app/assets/javascripts/discourse/components/date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/date-input.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -37,7 +38,7 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      Ember.run.next(() => {
+      next(() => {
         const default_opts = {
           field: this.element.querySelector(".date-picker"),
           container: container || this.element,
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index 7fc28a50ef..e9403326bb 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -30,7 +31,7 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      Ember.run.next(() => {
+      next(() => {
         const options = {
           field: this.element.querySelector(".date-picker"),
           container: container || null,
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 53ab8edbbe..796e0a9068 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,3 +1,7 @@
+import { throttle } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import AddArchetypeClass from "discourse/mixins/add-archetype-class";
@@ -50,13 +54,13 @@ export default Component.extend(
       const enteredAt = this.enteredAt;
       if (enteredAt && this.lastEnteredAt !== enteredAt) {
         this._lastShowTopic = null;
-        Ember.run.schedule("afterRender", () => this.scrolled());
+        schedule("afterRender", () => this.scrolled());
         this.set("lastEnteredAt", enteredAt);
       }
     },
 
     _highlightPost(postNumber) {
-      Ember.run.scheduleOnce("afterRender", null, highlight, postNumber);
+      scheduleOnce("afterRender", null, highlight, postNumber);
     },
 
     _hideTopicInHeader() {
@@ -78,7 +82,7 @@ export default Component.extend(
           this.pauseHeaderTopicUpdate = true;
           this._lastShowTopic = true;
 
-          Ember.run.later(() => {
+          later(() => {
             this._lastShowTopic = false;
             this.pauseHeaderTopicUpdate = false;
           }, debounceDuration);
@@ -192,7 +196,7 @@ export default Component.extend(
       // at the start of the scroll. This feels a lot more snappy compared to waiting
       // for the scroll to end if we debounce.
       if (this.site.mobileView && this.hasScrolled) {
-        Ember.run.throttle(
+        throttle(
           this,
           this.calculateDirection,
           offset,
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 c9b2bb92bb..6706cacd4a 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -1,3 +1,5 @@
+import { schedule } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
@@ -12,11 +14,9 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
   _readjustScrollPosition() {
     const scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      Ember.run.schedule("afterRender", () =>
-        $(window).scrollTop(scrollTo + 1)
-      );
+      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
     } else {
-      Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
+      scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
     }
   },
 
@@ -38,7 +38,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
     loadMore() {
       Discourse.updateContextCount(0);
       this.model.loadMore().then(hasMoreResults => {
-        Ember.run.schedule("afterRender", () => this.saveScrollPosition());
+        schedule("afterRender", () => this.saveScrollPosition());
         if (!hasMoreResults) {
           this.eyeline.flushRest();
         } else if ($(window).height() >= $(document).height()) {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 15aae0ed28..42be7233af 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -20,7 +21,7 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-    Ember.run.scheduleOnce("afterRender", this, this._addToCollection);
+    scheduleOnce("afterRender", this, this._addToCollection);
   },
 
   _addToCollection: function() {
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.es6
index b1d5c79d81..c3254cc3d6 100644
--- a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
@@ -1,9 +1,10 @@
+import { scheduleOnce } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
 export default buildCategoryPanel("topic-template", {
   _activeTabChanged: function() {
     if (this.activeTab) {
-      Ember.run.scheduleOnce("afterRender", () =>
+      scheduleOnce("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
       );
     }
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.es6
index 5d01c739e7..c46af80e2f 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -73,7 +74,7 @@ export default Component.extend({
   @observes("selection")
   _updateBasedOnLastPost() {
     if (!this.autoClose) {
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         this.set("topicTimer.based_on_last_post", false);
       });
     }
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 7008eb1d01..d2b980a8f2 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -1,10 +1,11 @@
+import { scheduleOnce } from "@ember/runloop";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import autosize from "discourse/lib/autosize";
 
 export default Ember.TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       $(this.element).focus();
       autosize(this.element);
     });
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js.es6
index f039b30660..b52f544907 100644
--- a/app/assets/javascripts/discourse/components/flag-selection.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-selection.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 
@@ -16,6 +17,6 @@ export default Component.extend({
 
   @observes("nameKey")
   selectedChanged() {
-    Ember.run.next(this, this._selectRadio);
+    next(this, this._selectRadio);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js.es6 b/app/assets/javascripts/discourse/components/footer-nav.js.es6
index 7ac143225a..d94910364e 100644
--- a/app/assets/javascripts/discourse/components/footer-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/footer-nav.js.es6
@@ -1,3 +1,4 @@
+import { throttle } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import MobileScrollDirection from "discourse/mixins/mobile-scroll-direction";
 import Scrolling from "discourse/mixins/scrolling";
@@ -78,7 +79,7 @@ const FooterNavComponent = MountWidget.extend(
 
       const offset = window.pageYOffset || $("html").scrollTop();
 
-      Ember.run.throttle(
+      throttle(
         this,
         this.calculateDirection,
         offset,
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 5bacd98013..1b288f5429 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,3 +1,4 @@
+import { bind } from "@ember/runloop";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
@@ -88,13 +89,10 @@ export default Component.extend(
 
     @on("didInsertElement")
     _setupLogsNotice() {
-      this._boundRerenderBuffer = Ember.run.bind(this, this.rerenderBuffer);
+      this._boundRerenderBuffer = bind(this, this.rerenderBuffer);
       LogsNotice.current().addObserver("hidden", this._boundRerenderBuffer);
 
-      this._boundResetCurrentProp = Ember.run.bind(
-        this,
-        this._resetCurrentProp
-      );
+      this._boundResetCurrentProp = bind(this, this._resetCurrentProp);
       $(this.element).on(
         "click.global-notice",
         ".alert-logs-notice .close",
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index a80512b93d..a190ffda1d 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -25,7 +26,7 @@ export default Component.extend({
 
   @observes("model.flair_url")
   _loadSVGIcon() {
-    Ember.run.debounce(this, this._loadIcon, 1000);
+    debounce(this, this._loadIcon, 1000);
   },
 
   _loadIcon() {
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 9142c17e60..ca919959a8 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
@@ -77,13 +78,13 @@ export default Component.extend(UploadMixin, {
   },
 
   _openLightbox() {
-    Ember.run.next(() =>
+    next(() =>
       $(this.element.querySelector("a.lightbox")).magnificPopup("open")
     );
   },
 
   _applyLightbox() {
-    if (this.imageUrl) Ember.run.next(() => lightbox($(this.element)));
+    if (this.imageUrl) next(() => lightbox($(this.element)));
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js.es6
index 653761018e..19015ec0e8 100644
--- a/app/assets/javascripts/discourse/components/link-to-input.js.es6
+++ b/app/assets/javascripts/discourse/components/link-to-input.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   showInput: false,
@@ -5,7 +6,7 @@ export default Component.extend({
   click() {
     this.onClick();
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element)
         .find("input")
         .focus();
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
index e8bbe98c87..2ee72f8722 100644
--- a/app/assets/javascripts/discourse/components/login-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
@@ -14,7 +15,7 @@ export default Component.extend({
       this.set("loginName", $.cookie("email"));
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $(
         "#login-account-password, #login-account-name, #login-second-factor"
       ).keydown(e => {
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index a60a107079..a47c09c5c4 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 
@@ -21,7 +22,7 @@ export default Component.extend({
   @observes("currentPath")
   currentPathChanged() {
     this.set("expanded", false);
-    Ember.run.next(() => this._updateSelectedHtml());
+    next(() => this._updateSelectedHtml());
   },
 
   _updateSelectedHtml() {
@@ -41,7 +42,7 @@ export default Component.extend({
     toggleExpanded() {
       this.toggleProperty("expanded");
 
-      Ember.run.next(() => {
+      next(() => {
         if (this.expanded) {
           $(window)
             .off("click.mobile-nav")
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 5f0e584977..1363750b81 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
 import { WidgetClickHook } from "discourse/widgets/hooks";
@@ -50,7 +52,7 @@ export default Component.extend({
 
     this._rootNode = document.createElement("div");
     this.element.appendChild(this._rootNode);
-    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
+    this._timeout = scheduleOnce("render", this, this.rerenderWidget);
   },
 
   willClearRender() {
@@ -68,7 +70,7 @@ export default Component.extend({
       const [eventName, caller] = evt;
       this.appEvents.off(eventName, this, caller);
     });
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
   },
 
   afterRender() {},
@@ -97,13 +99,13 @@ export default Component.extend({
       this._renderCallback = callback;
     }
 
-    Ember.run.scheduleOnce("render", this, this.rerenderWidget);
+    scheduleOnce("render", this, this.rerenderWidget);
   },
 
   buildArgs() {},
 
   rerenderWidget() {
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
 
     if (this._rootNode) {
       if (!this._widgetClass) {
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 01dacde789..bf2947fc1d 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -69,7 +70,7 @@ export default Component.extend({
       if (this.expanded) {
         DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        Ember.run.next(() => {
+        next(() => {
           if (!this.expanded) {
             return;
           }
@@ -77,7 +78,7 @@ export default Component.extend({
           $(this.element.querySelector(".drop a")).on("click", () => {
             this.element.querySelector(".drop").style.display = "none";
 
-            Ember.run.next(() => {
+            next(() => {
               if (!this.element || this.isDestroying || this.isDestroyed) {
                 return;
               }
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
index b6c9df818b..e2e60f3d88 100644
--- a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
@@ -1,3 +1,4 @@
+import { bind } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -18,10 +19,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   _registerListener() {
-    this._promptEventHandler = Ember.run.bind(
-      this,
-      this._handleInstallPromptEvent
-    );
+    this._promptEventHandler = bind(this, this._handleInstallPromptEvent);
     window.addEventListener("beforeinstallprompt", this._promptEventHandler);
   },
 
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index f16bf6690d..ec8b8c47e8 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
 import { selectedText } from "discourse/lib/utilities";
@@ -103,7 +104,7 @@ export default Component.extend({
     }
 
     // change the position of the button
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       let top = markerOffset.top;
       let left = markerOffset.left + Math.max(0, parentScrollLeft);
 
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
index dad7447f0c..7637845c1e 100644
--- a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
+++ b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import Scrolling from "discourse/mixins/scrolling";
 
@@ -19,7 +20,7 @@ export default Component.extend(Scrolling, {
 
     const data = this.session.get(this.trackerName);
     if (data && data.position >= 0 && data.tag === this.tag) {
-      Ember.run.next(() => $(window).scrollTop(data.position + 1));
+      next(() => $(window).scrollTop(data.position + 1));
     }
   },
 
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 89a48126f3..04f0897eb6 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,3 +1,6 @@
+import { next } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
+import { 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";
@@ -204,7 +207,7 @@ export default MountWidget.extend({
               // will cause the browser to scroll to the top of the document
               // in Chrome. This makes sure the scroll works correctly if that
               // happens.
-              Ember.run.next(() => $("html, body").scrollTop(whereY));
+              next(() => $("html, body").scrollTop(whereY));
             }
           });
         };
@@ -270,7 +273,7 @@ export default MountWidget.extend({
   },
 
   _scrollTriggered() {
-    Ember.run.scheduleOnce("afterRender", this, this.scrolled);
+    scheduleOnce("afterRender", this, this.scrolled);
   },
 
   _posted(staged) {
@@ -306,13 +309,12 @@ export default MountWidget.extend({
   },
 
   _debouncedScroll() {
-    Ember.run.debounce(this, this._scrollTriggered, 10);
+    debounce(this, this._scrollTriggered, 10);
   },
 
   didInsertElement() {
     this._super(...arguments);
-    const debouncedScroll = () =>
-      Ember.run.debounce(this, this._scrollTriggered, 10);
+    const debouncedScroll = () => debounce(this, this._scrollTriggered, 10);
 
     this._previouslyNearby = {};
 
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 333b6d6549..8f1779487d 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -72,13 +74,13 @@ export default Component.extend({
 
     this._init();
 
-    Ember.run.scheduleOnce("afterRender", () => this._update());
+    scheduleOnce("afterRender", () => this._update());
   },
 
   @observes("searchTerm")
   _updateOptions() {
     this._update();
-    Ember.run.debounce(this, this._update, 250);
+    debounce(this, this._update, 250);
   },
 
   _init() {
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6
index 65f5cfd964..45b9317145 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/share-panel.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -47,7 +48,7 @@ export default Component.extend({
       this.element.querySelector(".topic-share-url-for-touch a")
     );
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       if (!this.capabilities.touch) {
         $linkForTouch.parent().remove();
 
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 17e05c47c9..49d8f67723 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,3 +1,5 @@
+import { bind } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
@@ -89,7 +91,7 @@ export default Component.extend({
     this.set("link", url);
     this.set("visible", true);
 
-    Ember.run.scheduleOnce("afterRender", this, this._focusUrl);
+    scheduleOnce("afterRender", this, this._focusUrl);
   },
 
   _mouseDownHandler(event) {
@@ -154,9 +156,9 @@ export default Component.extend({
 
   @on("init")
   _setupHandlers() {
-    this._boundMouseDownHandler = Ember.run.bind(this, this._mouseDownHandler);
-    this._boundClickHandler = Ember.run.bind(this, this._clickHandler);
-    this._boundKeydownHandler = Ember.run.bind(this, this._keydownHandler);
+    this._boundMouseDownHandler = bind(this, this._mouseDownHandler);
+    this._boundClickHandler = bind(this, this._clickHandler);
+    this._boundKeydownHandler = bind(this, this._keydownHandler);
   },
 
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index d7630e2681..49536eff37 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   action: "showCreateAccount",
@@ -10,10 +11,7 @@ export default Component.extend({
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
-      Ember.run.later(
-        () => this.session.set("showSignupCta", false),
-        20 * 1000
-      );
+      later(() => this.session.set("showSignupCta", false), 20 * 1000);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 41c71a48e5..b7b82071c1 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -1,3 +1,6 @@
+import { cancel } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import { observes } from "ember-addons/ember-computed-decorators";
 import Docking from "discourse/mixins/docking";
@@ -38,7 +41,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
   _animateClosing($panel, menuOrigin, windowWidth) {
     $panel.css(menuOrigin, -windowWidth);
     this._animate = true;
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.eventDispatched("dom:clean", "header");
       this._panMenuOffset = 0;
     });
@@ -222,7 +225,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
     this.appEvents.off("header:hide-topic", this, "setTopic");
     this.appEvents.off("dom:clean", this, "_cleanDom");
 
-    Ember.run.cancel(this._scheduledRemoveAnimate);
+    cancel(this._scheduledRemoveAnimate);
     window.cancelAnimationFrame(this._scheduledMovingAnimation);
   },
 
@@ -346,7 +349,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
       if (this._animate) {
         $panel.addClass("animate");
         $headerCloak.addClass("animate");
-        this._scheduledRemoveAnimate = Ember.run.later(() => {
+        this._scheduledRemoveAnimate = later(() => {
           $panel.removeClass("animate");
           $headerCloak.removeClass("animate");
         }, 200);
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 37a4cb2959..d5bc066fb0 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,8 +1,9 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
-    Ember.run.next(null, () => {
+    next(null, () => {
       const $this = $(this.element);
 
       if ($this) {
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js.es6
index c9c65e1034..6ec44fb306 100644
--- a/app/assets/javascripts/discourse/components/time-input.js.es6
+++ b/app/assets/javascripts/discourse/components/time-input.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { isNumeric } from "discourse/lib/utilities";
 
@@ -36,7 +37,7 @@ export default Component.extend({
           this._processMinutesChange(value);
         }
 
-        Ember.run.schedule("afterRender", () => (event.target.value = value));
+        schedule("afterRender", () => (event.target.value = value));
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
index f55197d804..ead6913e82 100644
--- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import CleansUp from "discourse/mixins/cleans-up";
@@ -77,7 +78,7 @@ export default Component.extend(CleansUp, {
 
     this.setProperties({ topic: data.topic, visible: true });
 
-    Ember.run.scheduleOnce("afterRender", this, this._setCSS);
+    scheduleOnce("afterRender", this, this._setCSS);
 
     $("html")
       .off("mousedown.topic-entrance")
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index c099c8b790..870c68f9c8 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -69,9 +70,7 @@ export default Component.extend(LoadMore, {
 
     let scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      Ember.run.schedule("afterRender", () =>
-        $(window).scrollTop(scrollTo + 1)
-      );
+      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index 4a67114f1a..b2115e755d 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,4 +1,6 @@
 import EmberObject from "@ember/object";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
@@ -52,7 +54,7 @@ export default Component.extend(PanEvents, {
   },
 
   _checkSize() {
-    Ember.run.scheduleOnce("afterRender", this, this._performCheckSize);
+    scheduleOnce("afterRender", this, this._performCheckSize);
   },
 
   // we need to store this so topic progress has something to init with
@@ -88,7 +90,7 @@ export default Component.extend(PanEvents, {
   composerOpened() {
     this.set("composerOpen", true);
     // we need to do the check after animation is done
-    Ember.run.later(() => this._checkSize(), 500);
+    later(() => this._checkSize(), 500);
   },
 
   composerClosed() {
@@ -99,7 +101,7 @@ export default Component.extend(PanEvents, {
   _collapseFullscreen() {
     if (this.get("info.topicProgressExpanded")) {
       $(".timeline-fullscreen").removeClass("show");
-      Ember.run.later(() => {
+      later(() => {
         if (!this.element || this.isDestroying || this.isDestroyed) {
           return;
         }
@@ -137,7 +139,7 @@ export default Component.extend(PanEvents, {
     } else if (offset <= 0) {
       $timelineContainer.css("bottom", "");
     } else {
-      Ember.run.later(() => this._handlePanDone(offset, event), 20);
+      later(() => this._handlePanDone(offset, event), 20);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 61db49b425..19ec394b03 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -73,7 +74,7 @@ export default Component.extend({
 
   @observes("postStream.stream.[]")
   _updateBar() {
-    Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
+    scheduleOnce("afterRender", this, this._updateProgressBar);
   },
 
   _topicScrolled(event) {
@@ -100,16 +101,11 @@ export default Component.extend({
 
     const prevEvent = this.prevEvent;
     if (prevEvent) {
-      Ember.run.scheduleOnce(
-        "afterRender",
-        this,
-        this._topicScrolled,
-        prevEvent
-      );
+      scheduleOnce("afterRender", this, this._topicScrolled, prevEvent);
     } else {
-      Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
+      scheduleOnce("afterRender", this, this._updateProgressBar);
     }
-    Ember.run.scheduleOnce("afterRender", this, this._dock);
+    scheduleOnce("afterRender", this, this._dock);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 1d9ec49b78..9aa6541065 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import Docking from "discourse/mixins/docking";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -94,7 +95,7 @@ export default MountWidget.extend(Docking, {
     this._super(...arguments);
 
     if (this.fullscreen && !this.addShowClass) {
-      Ember.run.next(() => {
+      next(() => {
         this.set("addShowClass", true);
         this.queueRerender();
       });
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 c7e2ed244a..bb26e0caba 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
@@ -85,11 +87,7 @@ export default Component.extend(
 
         // TODO Sam: concerned this can cause a heavy rerender loop
         if (!Ember.testing) {
-          this._delayedRerender = Ember.run.later(
-            this,
-            this.rerender,
-            rerenderDelay
-          );
+          this._delayedRerender = later(this, this.rerender, rerenderDelay);
         }
       }
     },
@@ -110,7 +108,7 @@ export default Component.extend(
       $(this.element).off("click.topic-timer-remove", this.removeTopicTimer);
 
       if (this._delayedRerender) {
-        Ember.run.cancel(this._delayedRerender);
+        cancel(this._delayedRerender);
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index cbb9b779bc..16c7e1fb79 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 import ClickTrack from "discourse/lib/click-track";
@@ -23,7 +24,7 @@ export default Component.extend(LoadMore, {
   classNames: ["user-stream"],
 
   _scrollTopOnModelChange: function() {
-    Ember.run.schedule("afterRender", () => $(document).scrollTop(0));
+    schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
   _inserted: Ember.on("didInsertElement", function() {
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
index 0a02adf223..a24f6a53b1 100644
--- a/app/assets/javascripts/discourse/controllers/auth-token.js.es6
+++ b/app/assets/javascripts/discourse/controllers/auth-token.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
@@ -24,7 +25,7 @@ export default Controller.extend(ModalFunctionality, {
     highlightSecure() {
       this.send("closeModal");
 
-      Ember.run.next(() => {
+      next(() => {
         const $prefPasswordDiv = $(".pref-password");
 
         $prefPasswordDiv.addClass("highlighted");
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 28acef583e..6496ccb0be 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -53,7 +54,7 @@ export default Controller.extend(ModalFunctionality, {
           if (this.get("topicController.multiSelect")) {
             this.topicController.send("toggleMultiSelect");
           }
-          Ember.run.next(() =>
+          next(() =>
             DiscourseURL.routeTo(this.get("topicController.model.url"))
           );
         },
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 7744b066e1..0251ab8883 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -47,7 +48,7 @@ export default Controller.extend(ModalFunctionality, {
         .then(() => {
           this.send("closeModal");
           this.setProperties({ date: "", time: "", saving: false });
-          Ember.run.next(() => DiscourseURL.routeTo(topic.url));
+          next(() => DiscourseURL.routeTo(topic.url));
         })
         .catch(() =>
           this.flash(I18n.t("topic.change_timestamp.error"), "alert-error")
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 01867e7c6a..a4ecfb8476 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -1046,7 +1047,7 @@ export default Controller.extend({
 
   @observes("model.reply", "model.title")
   _shouldSaveDraft() {
-    Ember.run.debounce(this, this._saveDraft, 2000);
+    debounce(this, this._saveDraft, 2000);
   },
 
   @computed("model.categoryId", "lastValidatedAt")
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 7b8a1bec8f..2e3f44ae74 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import {
   on,
@@ -113,7 +114,7 @@ export default Controller.extend({
     tryLoading() {
       this.set("loading", true);
 
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         this.lastTransition.retry();
         this.set("loading", false);
       });
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index e1d714be39..63b724f89c 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,3 +1,6 @@
+import { debounce } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
@@ -15,7 +18,7 @@ export default Controller.extend(ModalFunctionality, {
       selectedRow: -1
     });
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       const element = document.querySelector(".insert-link");
 
       element.addEventListener("keydown", e => this.keyDown(e));
@@ -135,7 +138,7 @@ export default Controller.extend(ModalFunctionality, {
       .closest(".modal-inner-container")
       .removeEventListener("mousedown", this.mouseDown);
 
-    Ember.run.cancel(this._debounced);
+    cancel(this._debounced);
   },
 
   actions: {
@@ -174,7 +177,7 @@ export default Controller.extend(ModalFunctionality, {
       }
     },
     search() {
-      this._debounced = Ember.run.debounce(this, this.triggerSearch, 400);
+      this._debounced = debounce(this, this.triggerSearch, 400);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index af6fd216f5..a0d4bd5950 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -10,7 +11,7 @@ export default Controller.extend(ModalFunctionality, {
   ),
 
   onShow() {
-    Ember.run.next(() => $("#post-jump").focus());
+    next(() => $("#post-jump").focus());
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index ca94d979c0..2501146805 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,4 +1,6 @@
 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 { ajax } from "discourse/lib/ajax";
@@ -150,7 +152,7 @@ export default Controller.extend(ModalFunctionality, {
 
               // only need to focus the 2FA input for TOTP
               if (!this.showSecurityKey) {
-                Ember.run.scheduleOnce("afterRender", () =>
+                scheduleOnce("afterRender", () =>
                   document
                     .getElementById("second-factor")
                     .querySelector("input")
@@ -322,7 +324,7 @@ export default Controller.extend(ModalFunctionality, {
     const loginError = (errorMsg, className, callback) => {
       showModal("login");
 
-      Ember.run.next(() => {
+      next(() => {
         if (callback) callback();
         this.flash(errorMsg, className || "success");
       });
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 8a89fc8e57..7c8c84648c 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -92,7 +93,7 @@ export default Controller.extend(ModalFunctionality, {
       );
     } else if (!this.canSplitTopic) {
       this.set("selection", "existing_topic");
-      Ember.run.next(() => $("#choose-topic-title").focus());
+      next(() => $("#choose-topic-title").focus());
     }
   },
 
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.es6
index ddddfbdb30..6554a77cd1 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -102,7 +103,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   _hideCopyMessage() {
-    Ember.run.later(
+    later(
       () => this.setProperties({ successMessage: null, errorMessage: null }),
       2000
     );
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index d31fe00292..06ac89f3ad 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,4 +1,6 @@
 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 { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -133,7 +135,7 @@ export default Controller.extend(bufferedProperty("model"), {
       return;
     }
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       this.send("showHistory", post, revision);
     });
   },
@@ -1426,7 +1428,7 @@ export default Controller.extend(bufferedProperty("model"), {
         // automatically unpin topics when the user reaches the bottom
         const max = _.max(postNumbers);
         if (topic.get("pinned") && max >= topic.get("highest_post_number")) {
-          Ember.run.next(() => topic.clearPin());
+          next(() => topic.clearPin());
         }
       }
     }
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
index 21faedd650..f685d1b091 100644
--- a/app/assets/javascripts/discourse/initializers/asset-version.js.es6
+++ b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 //  Subscribe to "asset-version" change events via the Message Bus
 export default {
   name: "asset-version",
@@ -16,7 +17,7 @@ export default {
       if (!timeoutIsSet && Discourse.get("requiresRefresh")) {
         // Since we can do this transparently for people browsing the forum
         //  hold back the message 24 hours.
-        Ember.run.later(() => {
+        later(() => {
           bootbox.confirm(I18n.t("assets_changed_confirm"), function(result) {
             if (result) {
               document.location.reload();
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
index 83e0183ff3..31101d9010 100644
--- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 export default {
   name: "auth-complete",
   after: "inject-objects",
@@ -13,7 +14,7 @@ export default {
     if (lastAuthResult) {
       const router = container.lookup("router:main");
       router.one("didTransition", () => {
-        Ember.run.next(() =>
+        next(() =>
           Discourse.authenticationComplete(JSON.parse(lastAuthResult))
         );
       });
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6
index a536398e94..b0708fca85 100644
--- a/app/assets/javascripts/discourse/initializers/mobile.js.es6
+++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import Mobile from "discourse/lib/mobile";
 import { setResolverOption } from "discourse-common/resolver";
 import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
@@ -17,7 +18,7 @@ export default {
     setResolverOption("mobileView", Mobile.mobileView);
 
     if (isAppWebview()) {
-      Ember.run.later(() => {
+      later(() => {
         postRNWebviewMessage(
           "headerBg",
           $(".d-header").css("background-color")
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js.es6
index cafa6e6f70..e2bb45ef08 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import pageVisible from "discourse/lib/page-visible";
 import logout from "discourse/lib/logout";
 
@@ -96,7 +97,7 @@ export function ajax() {
       handleRedirect(data);
       handleLogoff(xhr);
 
-      Ember.run(() => {
+      run(() => {
         Discourse.Site.currentProp(
           "isReadOnly",
           !!xhr.getResponseHeader("Discourse-Readonly")
@@ -107,7 +108,7 @@ export function ajax() {
         data = { result: data, xhr: xhr };
       }
 
-      Ember.run(null, resolve, data);
+      run(null, resolve, data);
     };
 
     args.error = (xhr, textStatus, errorThrown) => {
@@ -128,7 +129,7 @@ export function ajax() {
       xhr.jqTextStatus = textStatus;
       xhr.requestedUrl = url;
 
-      Ember.run(null, reject, {
+      run(null, reject, {
         jqXHR: xhr,
         textStatus: textStatus,
         errorThrown: errorThrown
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 18fc9a98e2..0bcb3331c8 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { later } from "@ember/runloop";
 /**
   This is a jQuery plugin to support autocompleting values in our text fields.
 
@@ -43,7 +45,7 @@ export default function(options) {
   if (this.length === 0) return;
 
   if (options === "destroy" || options.updateData) {
-    Ember.run.cancel(inputTimeout);
+    cancel(inputTimeout);
 
     $(this)
       .off("keyup.autocomplete")
@@ -402,7 +404,7 @@ export default function(options) {
   $(this).on("click.autocomplete", () => closeAutocomplete());
 
   $(this).on("paste.autocomplete", () => {
-    Ember.run.later(() => me.trigger("keydown"), 50);
+    later(() => me.trigger("keydown"), 50);
   });
 
   function checkTriggerRule(opts) {
@@ -455,8 +457,8 @@ export default function(options) {
     if (options.allowAny) {
       // saves us wiring up a change event as well
 
-      Ember.run.cancel(inputTimeout);
-      inputTimeout = Ember.run.later(function() {
+      cancel(inputTimeout);
+      inputTimeout = later(function() {
         if (inputSelectedItems.length === 0) {
           inputSelectedItems.push("");
         }
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
index 8d83f4d7f8..82cdb2d537 100644
--- a/app/assets/javascripts/discourse/lib/clean-dom.js.es6
+++ b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 function _clean() {
   if (window.MiniProfiler) {
     window.MiniProfiler.pageTransition();
@@ -35,5 +36,5 @@ function _clean() {
 }
 
 export function cleanDOM() {
-  Ember.run.scheduleOnce("afterRender", _clean);
+  scheduleOnce("afterRender", _clean);
 }
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index 42a65623a6..6e27ebbbe2 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
@@ -134,7 +135,7 @@ export default {
           $link.attr("href", null);
           $link.data("auto-route", true);
 
-          Ember.run.later(() => {
+          later(() => {
             $link.removeClass("no-href");
             $link.attr("href", $link.data("href"));
             $link.data("href", null);
diff --git a/app/assets/javascripts/discourse/lib/debounce.js.es6 b/app/assets/javascripts/discourse/lib/debounce.js.es6
index 6ab2eb1e58..f41b71f0d8 100644
--- a/app/assets/javascripts/discourse/lib/debounce.js.es6
+++ b/app/assets/javascripts/discourse/lib/debounce.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 /**
   Debounce a Javascript function. This means if it's called many times in a time limit it
   should only be executed once (at the end of the limit counted from the last call made).
@@ -13,6 +14,6 @@ export default function(func, wait) {
     self = this;
     args = arguments;
 
-    Ember.run.debounce(null, later, wait);
+    debounce(null, later, wait);
   };
 }
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 41b86bc30e..330772014d 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import KeyValueStore from "discourse/lib/key-value-store";
 import { formatUsername } from "discourse/lib/utilities";
@@ -79,7 +80,7 @@ function confirmNotification() {
   const clickEventHandler = () => notification.close();
 
   notification.addEventListener("click", clickEventHandler);
-  Ember.run.later(() => {
+  later(() => {
     notification.close();
     notification.removeEventListener("click", clickEventHandler);
   }, 10 * 1000);
@@ -177,7 +178,7 @@ function onNotification(data) {
     }
 
     notification.addEventListener("click", clickEventHandler);
-    Ember.run.later(() => {
+    later(() => {
       notification.close();
       notification.removeEventListener("click", clickEventHandler);
     }, 10 * 1000);
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index aa0b16efbb..991644737a 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,3 +1,5 @@
+import { run } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
@@ -140,7 +142,7 @@ export default {
   quoteReply() {
     this.sendToSelectedPost("replyToPost");
     // lazy but should work for now
-    Ember.run.later(() => $(".d-editor .quote").click(), 500);
+    later(() => $(".d-editor .quote").click(), 500);
 
     return false;
   },
@@ -210,7 +212,7 @@ export default {
   },
 
   showPageSearch(event) {
-    Ember.run(() => {
+    run(() => {
       this.appEvents.trigger("header:keyboard-trigger", {
         type: "page-search",
         event
@@ -219,7 +221,7 @@ export default {
   },
 
   printTopic(event) {
-    Ember.run(() => {
+    run(() => {
       if ($(".container.posts").length) {
         event.preventDefault(); // We need to stop printing the current page in Firefox
         this.container.lookup("controller:topic").print();
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
index d43b0f4a83..7179f234f1 100644
--- a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
 
@@ -7,7 +8,7 @@ const testedKey = "tested";
 const testedClass = `hashtag-${testedKey}`;
 
 function updateFound($hashtags, categorySlugs) {
-  Ember.run.schedule("afterRender", () => {
+  schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const categorySlug = categorySlugs[index];
       const link = validCategoryHashtags[categorySlug];
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 07f37388e4..68d0b8b5d6 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { formatUsername } from "discourse/lib/utilities";
@@ -39,7 +40,7 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  Ember.run.scheduleOnce("afterRender", function() {
+  scheduleOnce("afterRender", function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
index a0b2c95c46..5aa3f6d612 100644
--- a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
@@ -7,7 +8,7 @@ const checkedTagHashtags = [];
 const testedClass = "tag-hashtag-tested";
 
 function updateFound($hashtags, tagValues) {
-  Ember.run.schedule("afterRender", () => {
+  schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const tagValue = tagValues[index];
       const link = validTagHashtags[tagValue];
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 34b3f2897b..c1f11ec0f4 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 const _loaded = {};
 const _loading = {};
@@ -22,7 +23,7 @@ function loadWithTag(path, cb) {
     ) {
       s = s.onload = s.onreadystatechange = null;
       if (!abort) {
-        Ember.run(null, cb);
+        run(null, cb);
       }
     }
   };
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index d7577ed5ae..4acbdc4ea3 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 let _started = false;
 let cache = {};
 let transitionCount = 0;
@@ -31,7 +32,7 @@ export function startPageTracking(router, appEvents) {
 
     // Refreshing the title is debounced, so we need to trigger this in the
     // next runloop to have the correct title.
-    Ember.run.next(() => {
+    next(() => {
       let title = Discourse.get("_docTitle");
 
       appEvents.trigger("page:changed", {
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index e613ba16e3..ac64d26461 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
 import {
   safariHacksDisabled,
@@ -94,10 +95,7 @@ function positioningWorkaround($fixedElement) {
 
       if (!iOSWithVisualViewport()) {
         fixedElement.style.height = oldHeight;
-        Ember.run.later(
-          () => $(fixedElement).removeClass("no-transition"),
-          500
-        );
+        later(() => $(fixedElement).removeClass("no-transition"), 500);
       }
 
       $(window).scrollTop(originalScrollTop);
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index a36b15cb21..314e1fac0a 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -1,3 +1,4 @@
+import { bind } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 
 // We use this class to track how long posts in a topic are on the screen.
@@ -26,7 +27,7 @@ export default class {
     // Create an interval timer if we don't have one.
     if (!this._interval) {
       this._interval = setInterval(() => this.tick(), 1000);
-      this._boundScrolled = Ember.run.bind(this, this.scrolled);
+      this._boundScrolled = bind(this, this.scrolled);
       $(window).on("scroll.screentrack", this._boundScrolled);
     }
 
diff --git a/app/assets/javascripts/discourse/lib/throttle.js.es6 b/app/assets/javascripts/discourse/lib/throttle.js.es6
index 2e8673203b..05daa36c5a 100644
--- a/app/assets/javascripts/discourse/lib/throttle.js.es6
+++ b/app/assets/javascripts/discourse/lib/throttle.js.es6
@@ -1,3 +1,4 @@
+import { throttle } from "@ember/runloop";
 /**
   Throttle a Javascript function. This means if it's called many times in a time limit it
   should only be executed one time at most during this time limit
@@ -13,6 +14,6 @@ export default function(func, spacing, immediate) {
     self = this;
     args = arguments;
 
-    Ember.run.throttle(null, later, spacing, immediate);
+    throttle(null, later, spacing, immediate);
   };
 }
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 085619f9e9..0dbb7aa3ce 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,4 +1,6 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
@@ -66,7 +68,7 @@ export function jumpToElement(elementId) {
 
   const selector = `#${elementId}, a[name=${elementId}]`;
   _jumpScheduled = true;
-  Ember.run.schedule("afterRender", function() {
+  schedule("afterRender", function() {
     const lockon = new LockOn(selector, {
       finished() {
         _jumpScheduled = false;
@@ -90,7 +92,7 @@ const DiscourseURL = EmberObject.extend({
 
     _transitioning = postNumber > 1;
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       let elementId;
       let holder;
 
@@ -156,7 +158,7 @@ const DiscourseURL = EmberObject.extend({
       // Always use replaceState in the next runloop to prevent weird routes changing
       // while URLs are loading. For example, while a topic loads it sets `currentPost`
       // which triggers a replaceState even though the topic hasn't fully loaded yet!
-      Ember.run.next(() => {
+      next(() => {
         const location = DiscourseURL.get("router.location");
         if (location && location.replaceURL) {
           location.replaceURL(path);
@@ -250,7 +252,7 @@ const DiscourseURL = EmberObject.extend({
     path = rewritePath(path);
 
     if (typeof opts.afterRouteComplete === "function") {
-      Ember.run.schedule("afterRender", opts.afterRouteComplete);
+      schedule("afterRender", opts.afterRouteComplete);
     }
 
     if (this.navigatedToPost(oldPath, path, opts)) {
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 212278f2e0..69bafea2fb 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,3 +1,6 @@
+import { throttle } from "@ember/runloop";
+import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
@@ -142,7 +145,7 @@ export default Ember.Mixin.create({
   _bindMobileScroll() {
     const mobileScrollEvent = this.mobileScrollEvent;
     const onScroll = () => {
-      Ember.run.throttle(this, this._close, 1000);
+      throttle(this, this._close, 1000);
     };
 
     $(window).on(mobileScrollEvent, onScroll);
@@ -171,7 +174,7 @@ export default Ember.Mixin.create({
 
     let verticalAdjustments = 0;
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       if (target) {
         if (!this.site.mobileView) {
           let position = target.offset();
@@ -245,7 +248,7 @@ export default Ember.Mixin.create({
         // note: we DO NOT use afterRender here cause _positionCard may
         // run afterwards, if we allowed this to happen the usercard
         // may be offscreen and we may scroll all the way to it on focus
-        Ember.run.next(null, () => {
+        next(null, () => {
           const firstLink = this.element.querySelector("a");
           firstLink && firstLink.focus();
         });
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js.es6
index 800898ae70..18a5ae5bf6 100644
--- a/app/assets/javascripts/discourse/mixins/docking.js.es6
+++ b/app/assets/javascripts/discourse/mixins/docking.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 const helper = {
   offset() {
     const mainOffset = $("#main").offset();
@@ -12,7 +13,7 @@ export default Ember.Mixin.create({
   init() {
     this._super(...arguments);
     this.queueDockCheck = () => {
-      Ember.run.debounce(this, this.safeDockCheck, 5);
+      debounce(this, this.safeDockCheck, 5);
     };
   },
 
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
index 0f27500a09..edd93096f0 100644
--- a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
+++ b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 // Small buffer so that very tiny scrolls don't trigger mobile header switch
 const MOBILE_SCROLL_TOLERANCE = 5;
 
@@ -42,7 +43,7 @@ export default Ember.Mixin.create({
     // If the user reaches the very bottom of the topic, we only want to reset
     // this scroll direction after a second scrolldown. This is a nicer event
     // similar to what Safari and Chrome do.
-    Ember.run.debounce(() => {
+    debounce(() => {
       this._bottomHit = 1;
     }, 1000);
 
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index 630227b8fa..f666e9be5a 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import { deprecated } from "discourse/mixins/scroll-top";
 
@@ -14,7 +15,7 @@ function scrollTop() {
   if (DiscourseURL.isJumpScheduled()) {
     return;
   }
-  Ember.run.scheduleOnce("afterRender", context, context._scrollTop);
+  scheduleOnce("afterRender", context, context._scrollTop);
 }
 
 export default Ember.Mixin.create({
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index 690bf1168f..f51474c0b2 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
 
 /**
@@ -37,7 +38,7 @@ const Scrolling = Ember.Mixin.create({
       if (router.activeTransition) {
         return;
       }
-      return Ember.run.scheduleOnce("afterRender", this, "scrolled");
+      return scheduleOnce("afterRender", this, "scrolled");
     };
 
     if (opts.debounce) {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 4d851e6e3a..3a265ab342 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,4 +1,7 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
@@ -994,7 +997,7 @@ const Composer = RestModel.extend({
               post.set("reply_count", post.reply_count - 1);
             }
           }
-          Ember.run.next(() => composer.set("composeState", OPEN));
+          next(() => composer.set("composeState", OPEN));
         })
       );
   },
@@ -1045,7 +1048,7 @@ const Composer = RestModel.extend({
     });
 
     if (this._clearingStatus) {
-      Ember.run.cancel(this._clearingStatus);
+      cancel(this._clearingStatus);
       this._clearingStatus = null;
     }
 
@@ -1085,7 +1088,7 @@ const Composer = RestModel.extend({
     const draftStatus = this.draftStatus;
 
     if (draftStatus && !this._clearingStatus) {
-      this._clearingStatus = Ember.run.later(
+      this._clearingStatus = later(
         this,
         () => {
           this.setProperties({ draftStatus: null, draftConflictUser: null });
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 4130d7ffe6..cb1e5f0406 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,3 +1,5 @@
+import { once } from "@ember/runloop";
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
@@ -56,7 +58,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     // Ember doesn't provider a router `willTransition` event so let's make one
     willTransition() {
       var router = getOwner(this).lookup("router:main");
-      Ember.run.once(router, router.trigger, "willTransition");
+      once(router, router.trigger, "willTransition");
       return this._super(...arguments);
     },
 
@@ -226,7 +228,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
   activate() {
     this._super(...arguments);
-    Ember.run.next(function() {
+    next(function() {
       // Support for callbacks once the application has activated
       ApplicationRoute.trigger("activate");
     });
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js.es6
index 7cbfee6754..a182e85c88 100644
--- a/app/assets/javascripts/discourse/routes/associate-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/associate-account.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
@@ -7,7 +8,7 @@ export default DiscourseRoute.extend({
   beforeModel() {
     const params = this.paramsFor("associate-account");
     this.replaceWith(`preferences.account`, this.currentUser).then(() =>
-      Ember.run.next(() =>
+      next(() =>
         ajax(`/associate/${encodeURIComponent(params.token)}.json`)
           .then(model => showModal("associate-account-confirm", { model }))
           .catch(popupAjaxError)
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index fb828bddd1..2329168593 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,3 +1,4 @@
+import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
@@ -55,7 +56,7 @@ const DiscourseRoute = Route.extend({
     },
 
     refreshTitle() {
-      Ember.run.once(this, this._refreshTitleOnce);
+      once(this, this._refreshTitleOnce);
     },
 
     clearTopicDraft() {
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 19543ae481..125b6bf9d0 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
@@ -134,9 +135,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     didTransition() {
-      Ember.run.next(() =>
-        this.controllerFor("application").set("showFooter", true)
-      );
+      next(() => this.controllerFor("application").set("showFooter", true));
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
index e88fbdb082..58309565b5 100644
--- a/app/assets/javascripts/discourse/routes/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { defaultHomepage } from "discourse/lib/utilities";
 import buildStaticRoute from "discourse/routes/build-static-route";
 
@@ -11,7 +12,7 @@ ForgotPasswordRoute.reopen({
     this.replaceWith(
       loginRequired ? "login" : `discovery.${defaultHomepage()}`
     ).then(e => {
-      Ember.run.next(() => e.send("showForgotPassword"));
+      next(() => e.send("showForgotPassword"));
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js.es6
index 8465ceb6bc..c41f884f30 100644
--- a/app/assets/javascripts/discourse/routes/login.js.es6
+++ b/app/assets/javascripts/discourse/routes/login.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 import { defaultHomepage } from "discourse/lib/utilities";
 
@@ -7,7 +8,7 @@ LoginRoute.reopen({
   beforeModel() {
     if (!this.siteSettings.login_required) {
       this.replaceWith(`/${defaultHomepage()}`).then(e => {
-        Ember.run.next(() => e.send("showLogin"));
+        next(() => e.send("showLogin"));
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 1410c65356..c85001cbbf 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
@@ -15,7 +16,7 @@ export default DiscourseRoute.extend({
           User.findByUsername(encodeURIComponent(params.username))
             .then(user => {
               if (user.can_send_private_message_to_user) {
-                Ember.run.next(() =>
+                next(() =>
                   e.send(
                     "createNewMessageViaParams",
                     user.username,
@@ -35,7 +36,7 @@ export default DiscourseRoute.extend({
           Group.messageable(groupName)
             .then(result => {
               if (result.messageable) {
-                Ember.run.next(() =>
+                next(() =>
                   e.send(
                     "createNewMessageViaParams",
                     groupName,
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js.es6
index 82b2b496ef..550b4b5341 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
 
@@ -63,7 +64,7 @@ export default DiscourseRoute.extend({
   },
 
   _sendTransition(event, transition, categoryId) {
-    Ember.run.next(() => {
+    next(() => {
       event.send(
         "createNewTopicViaParams",
         transition.to.queryParams.title,
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js.es6
index a2753ded2b..9a732c67d8 100644
--- a/app/assets/javascripts/discourse/routes/signup.js.es6
+++ b/app/assets/javascripts/discourse/routes/signup.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 
 const SignupRoute = buildStaticRoute("signup");
@@ -9,13 +10,13 @@ SignupRoute.reopen({
     if (!this.siteSettings.login_required) {
       this.replaceWith("discovery.latest").then(e => {
         if (canSignUp) {
-          Ember.run.next(() => e.send("showCreateAccount"));
+          next(() => e.send("showCreateAccount"));
         }
       });
     } else {
       this.replaceWith("login").then(e => {
         if (canSignUp) {
-          Ember.run.next(() => e.send("showCreateAccount"));
+          next(() => e.send("showCreateAccount"));
         }
       });
     }
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index c3d0e6cf72..6f626644a4 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
@@ -57,7 +58,7 @@ export default DiscourseRoute.extend({
         topicController.subscribe();
 
         // Highlight our post after the next render
-        Ember.run.scheduleOnce("afterRender", () =>
+        scheduleOnce("afterRender", () =>
           this.appEvents.trigger("post:highlight", closest)
         );
 
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index e4b168ec7a..f992c01c5b 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,3 +1,6 @@
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
@@ -168,9 +171,9 @@ const TopicRoute = DiscourseRoute.extend({
           postUrl += "/" + currentPost;
         }
 
-        Ember.run.cancel(scheduledReplace);
+        cancel(scheduledReplace);
         lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = Ember.run.later(
+        scheduledReplace = later(
           this,
           "_replaceUnlessScrolling",
           postUrl,
@@ -186,7 +189,7 @@ const TopicRoute = DiscourseRoute.extend({
 
     willTransition() {
       this._super(...arguments);
-      Ember.run.cancel(scheduledReplace);
+      cancel(scheduledReplace);
       isTransitioning = true;
       return true;
     }
@@ -201,7 +204,7 @@ const TopicRoute = DiscourseRoute.extend({
       return;
     }
     lastScrollPos = currentPos;
-    scheduledReplace = Ember.run.later(
+    scheduledReplace = later(
       this,
       "_replaceUnlessScrolling",
       url,
@@ -302,7 +305,7 @@ const TopicRoute = DiscourseRoute.extend({
     // We reset screen tracking every time a topic is entered
     this.screenTrack.start(model.get("id"), controller);
 
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       this.appEvents.trigger("header:update-topic", model);
     });
   }
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index 44add9ca7e..44eabe7c03 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 export default class ComponentConnector {
   constructor(widget, componentName, opts, trackedProperties) {
     this.widget = widget;
@@ -13,7 +14,7 @@ export default class ComponentConnector {
     const elem = $elem[0];
     const { opts, widget, componentName } = this;
 
-    Ember.run.next(() => {
+    next(() => {
       const mounted = widget._findView();
 
       const view = widget.register
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index b077bde0eb..d5d1c98f3d 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import deprecated from "discourse-common/lib/deprecated";
 
 export default class Connector {
@@ -11,7 +12,7 @@ export default class Connector {
     const elem = $elem[0];
 
     const { opts, widget } = this;
-    Ember.run.next(() => {
+    next(() => {
       const mounted = widget._findView();
 
       if (opts.templateName) {
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 97fcbd3fe5..c3a6af4b80 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,3 +1,5 @@
+import { cancel } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import { diff, patch } from "virtual-dom";
 import { queryRegistry } from "discourse/widgets/widget";
 import DirtyKeys from "discourse/lib/dirty-keys";
@@ -25,11 +27,11 @@ export default class WidgetGlue {
   }
 
   queueRerender() {
-    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
+    this._timeout = scheduleOnce("render", this, this.rerenderWidget);
   }
 
   rerenderWidget() {
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
 
     // in test mode return early if store cannot be found
     if (Ember.testing) {
@@ -51,6 +53,6 @@ export default class WidgetGlue {
   }
 
   cleanUp() {
-    Ember.run.cancel(this._timeout);
+    cancel(this._timeout);
   }
 }
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 4b25906350..b11689796a 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import DiscourseURL from "discourse/lib/url";
@@ -342,7 +343,7 @@ export default createWidget("hamburger-menu", {
       const $headerCloak = $(".header-cloak");
       $headerCloak.addClass("animate");
       $headerCloak.css("opacity", 0);
-      Ember.run.later(() => this.sendWidgetAction("toggleHamburger"), 200);
+      later(() => this.sendWidgetAction("toggleHamburger"), 200);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 0d1d30cc9a..02fd704dca 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { avatarImg } from "discourse/widgets/post";
@@ -419,7 +420,7 @@ export default createWidget("header", {
     this.updateHighlight();
 
     if (this.state.searchVisible) {
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         const $searchInput = $("#search-term");
         $searchInput.focus().select();
 
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index c44035f76c..3c70593130 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,3 +1,5 @@
+import { run } from "@ember/runloop";
+import { next } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
@@ -7,7 +9,7 @@ const LIKE_ACTION = 2;
 
 function animateHeart($elem, start, end, complete) {
   if (Ember.testing) {
-    return Ember.run(this, complete);
+    return run(this, complete);
   }
 
   $elem
@@ -411,7 +413,7 @@ export default createWidget("post-menu", {
       const likedPostId = keyValueStore.getInt("likedPostId");
       if (likedPostId === attrs.id) {
         keyValueStore.remove("likedPostId");
-        Ember.run.next(() => this.sendWidgetAction("toggleLike"));
+        next(() => this.sendWidgetAction("toggleLike"));
       }
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
index 9291d8a4e6..6406d1c9e8 100644
--- a/app/assets/javascripts/discourse/widgets/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import transformPost from "discourse/lib/transform-post";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -39,7 +40,7 @@ export function cloak(post, component) {
   _heights[post.id] = $post.outerHeight();
 
   component.dirtyKeys.keyDirty(`post-${post.id}`);
-  Ember.run.debounce(component, "queueRerender", 1000);
+  debounce(component, "queueRerender", 1000);
 }
 
 export function uncloak(post, component) {
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 808f3282c3..1bd428a835 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -30,7 +32,7 @@ const SearchHelper = {
     }
 
     this._cancelSearch = true;
-    Ember.run.later(() => (this._cancelSearch = false), 400);
+    later(() => (this._cancelSearch = false), 400);
   },
 
   perform(widget) {
@@ -285,7 +287,7 @@ export default createWidget("search-menu", {
     searchData.noResults = false;
     this.searchService().set("highlightTerm", searchData.term);
     searchData.loading = true;
-    Ember.run.debounce(SearchHelper, SearchHelper.perform, this, 400);
+    debounce(SearchHelper, SearchHelper.perform, this, 400);
   },
 
   moreOfType(type) {
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index eac0ac7b5c..813a390ec5 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import ComponentConnector from "discourse/widgets/component-connector";
 import { h } from "virtual-dom";
@@ -400,7 +401,7 @@ export default createWidget("topic-timeline", {
     const stream = this.attrs.topic.get("postStream");
 
     // a little debounce to avoid flashing
-    Ember.run.later(() => {
+    later(() => {
       if (!this.state.position === scrollPosition) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index 96e56fb7ac..cf669d1edc 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { formatUsername } from "discourse/lib/utilities";
@@ -227,7 +228,7 @@ export default createWidget("user-menu", {
       const $headerCloak = $(".header-cloak");
       $headerCloak.addClass("animate");
       $headerCloak.css("opacity", 0);
-      Ember.run.later(() => this.sendWidgetAction("toggleUserMenu"), 200);
+      later(() => this.sendWidgetAction("toggleUserMenu"), 200);
     }
   },
 
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index 4753ec8015..a500274a77 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 let timeout;
 const loadingQueue = [];
 let localCache = {};
@@ -82,7 +83,7 @@ function loadNext(ajax) {
       }
     )
     .finally(() => {
-      timeout = Ember.run.later(() => loadNext(ajax), timeoutMs);
+      timeout = later(() => loadNext(ajax), timeoutMs);
       if (removeLoading) {
         $elem.removeClass(LOADING_ONEBOX_CSS_CLASS);
         $elem.data("onebox-loaded");
@@ -129,7 +130,7 @@ export function load({
   if (synchronous) {
     return loadNext(ajax);
   } else {
-    timeout = timeout || Ember.run.later(() => loadNext(ajax), 150);
+    timeout = timeout || later(() => loadNext(ajax), 150);
   }
 }
 
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
index 8b0b4db2b4..3a2f46805c 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
@@ -1,3 +1,4 @@
+import { debounce } from "@ember/runloop";
 let _cache = {};
 
 export function lookupCachedUploadUrl(shortUrl) {
@@ -100,7 +101,7 @@ export function resolveAllShortUrls(ajax) {
     $shortUploadUrls = $(attributes);
     if ($shortUploadUrls.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
-      return Ember.run.debounce(
+      return debounce(
         null,
         () => _loadShortUrls($shortUploadUrls, ajax),
         450,
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index b086aa2e43..62522d9edd 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -1,3 +1,5 @@
+import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Mixin.create({
@@ -92,8 +94,8 @@ export default Ember.Mixin.create({
   focusFilterOrHeader() {
     const context = this;
     // next so we are sure it finised expand/collapse
-    Ember.run.next(() => {
-      Ember.run.schedule("afterRender", () => {
+    next(() => {
+      schedule("afterRender", () => {
         if (
           !context.$filterInput() ||
           !context.$filterInput().is(":visible") ||
@@ -129,9 +131,9 @@ export default Ember.Mixin.create({
     this.focusFilterOrHeader();
     this.autoHighlight();
 
-    Ember.run.next(() => {
+    next(() => {
       this._boundaryActionHandler("onExpand", this);
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         if (!this.isDestroying && !this.isDestroyed) {
           this._adjustPosition();
         }
@@ -144,9 +146,9 @@ export default Ember.Mixin.create({
 
     this.set("isExpanded", false);
 
-    Ember.run.next(() => {
+    next(() => {
       this._boundaryActionHandler("onCollapse", this);
-      Ember.run.schedule("afterRender", () => {
+      schedule("afterRender", () => {
         if (!this.isDestroying && !this.isDestroyed) {
           this._removeFixedPosition();
         }
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 0cbdf5da67..f985da1616 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,3 +1,5 @@
+import { throttle } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
 
 const { bind } = Ember.run;
@@ -138,7 +140,7 @@ export default Ember.Mixin.create({
       this.set("renderedFilterOnce", true);
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this.$filterInput()
         .focus()
         .val(this.$filterInput().val() + String.fromCharCode(keyCode));
@@ -267,7 +269,7 @@ export default Ember.Mixin.create({
 
     const direction = keyCode === 38 ? -1 : 1;
 
-    Ember.run.throttle(this, this._moveHighlight, direction, $rows, 32);
+    throttle(this, this._moveHighlight, direction, $rows, 32);
   },
 
   didPressBackspaceFromFilter(event) {
@@ -428,7 +430,7 @@ export default Ember.Mixin.create({
   },
 
   _highlightRow($row) {
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       $row.trigger("mouseover").focus();
       this.focus();
     });
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index e8b25973a6..de04d70bab 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 
 export default Component.extend({
@@ -60,7 +61,7 @@ export default Component.extend({
       this.updateField();
 
       this.set("inviteEmail", "");
-      Ember.run.scheduleOnce("afterRender", () =>
+      scheduleOnce("afterRender", () =>
         this.element.querySelector(".invite-email").focus()
       );
     },
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index b40d9839f1..e7ceaa898f 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes, on } from "ember-addons/ember-computed-decorators";
 
@@ -13,7 +14,7 @@ export default Component.extend({
   @on("init")
   updateVal() {
     const checked = this.value === this.radioValue;
-    Ember.run.next(
+    next(
       () => (this.element.querySelector("input[type=radio]").checked = checked)
     );
   }
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index c938d1e167..1d034d1c47 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import {
@@ -92,7 +93,7 @@ export default Component.extend({
   },
 
   autoFocus() {
-    Ember.run.scheduleOnce("afterRender", () => {
+    scheduleOnce("afterRender", () => {
       const $invalid = $(".wizard-field.invalid:eq(0) .wizard-focusable");
 
       if ($invalid.length) {
@@ -104,7 +105,7 @@ export default Component.extend({
   },
 
   animateInvalidFields() {
-    Ember.run.scheduleOnce("afterRender", () =>
+    scheduleOnce("afterRender", () =>
       $(".invalid input[type=text], .invalid textarea").wiggle(2, 100)
     );
   },
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js.es6
index 9112c3787f..64cc9571cc 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js.es6
+++ b/app/assets/javascripts/wizard/lib/ajax.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import getUrl from "discourse-common/lib/get-url";
 import jQuery from "jquery";
 
@@ -14,8 +15,8 @@ export function getToken() {
 export function ajax(args) {
   return new Ember.RSVP.Promise((resolve, reject) => {
     args.headers = { "X-CSRF-Token": getToken() };
-    args.success = data => Ember.run(null, resolve, data);
-    args.error = xhr => Ember.run(null, reject, xhr);
+    args.success = data => run(null, resolve, data);
+    args.error = xhr => run(null, reject, xhr);
     args.url = getUrl(args.url);
     jQuery.ajax(args);
   });
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6
index 0ee5a35b27..d597bfae53 100644
--- a/app/assets/javascripts/wizard/lib/preview.js.es6
+++ b/app/assets/javascripts/wizard/lib/preview.js.es6
@@ -1,3 +1,4 @@
+import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 /*eslint no-bitwise:0 */
 import getUrl from "discourse-common/lib/get-url";
@@ -72,7 +73,7 @@ export function createPreviewComponent(width, height, obj) {
       },
 
       triggerRepaint() {
-        Ember.run.scheduleOnce("afterRender", this, "repaint");
+        scheduleOnce("afterRender", this, "repaint");
       },
 
       repaint() {
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
index 1a4177542a..70a7e67fc0 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import startApp from "wizard/test/helpers/start-app";
 
 var wizard;
@@ -7,7 +8,7 @@ QUnit.module("Acceptance: wizard", {
   },
 
   afterEach() {
-    Ember.run(wizard, "destroy");
+    run(wizard, "destroy");
   }
 });
 
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
index 233869bb1a..d82b237c35 100644
--- a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import Wizard from "wizard/wizard";
 import initializer from "wizard/initializers/load-helpers";
 
@@ -5,7 +6,7 @@ let app;
 let started = false;
 
 export default function() {
-  Ember.run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
+  run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
 
   if (!started) {
     initializer.initialize(app);
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d620320f1b..8be1397497 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -73,6 +73,7 @@ module PrettyText
       ctx.attach("console.log", proc { |l| p l })
       ctx.eval('window.console = console;')
     end
+    ctx.eval("__PRETTY_TEXT = true")
 
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
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 6b2f7776f0..76e3d64088 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,3 +1,4 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
@@ -55,7 +56,7 @@ export default Component.extend({
     if (markup) {
       cookAsync(markup).then(result => {
         this.set("currentPreview", result);
-        Ember.run.schedule("afterRender", () =>
+        schedule("afterRender", () =>
           this.$(".preview .discourse-local-date").applyLocalDates()
         );
       });
@@ -409,7 +410,7 @@ export default Component.extend({
       date = null;
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this._picker.setMinDate(moment(date, this.dateFormat).toDate());
     });
   },
@@ -419,7 +420,7 @@ export default Component.extend({
       date = null;
     }
 
-    Ember.run.schedule("afterRender", () => {
+    schedule("afterRender", () => {
       this._picker.setDate(moment.utc(date), true);
     });
   },
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 c6818bb2ce..2e6521008e 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,3 +1,6 @@
+import { once } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -26,12 +29,12 @@ export default Component.extend({
   @on("didInsertElement")
   composerOpened() {
     this._lastPublish = new Date();
-    Ember.run.once(this, "updateState");
+    once(this, "updateState");
   },
 
   @observes("action", "post.id", "topic.id")
   composerStateChanged() {
-    Ember.run.once(this, "updateState");
+    once(this, "updateState");
   },
 
   @observes("reply", "title")
@@ -44,8 +47,8 @@ export default Component.extend({
   @on("willDestroyElement")
   composerClosing() {
     this.publish({ previous: this.currentState });
-    Ember.run.cancel(this._pingTimer);
-    Ember.run.cancel(this._clearTimer);
+    cancel(this._pingTimer);
+    cancel(this._clearTimer);
   },
 
   updateState() {
@@ -94,7 +97,7 @@ export default Component.extend({
         r.messagebus_channel,
         message => {
           if (!this.isDestroyed) this.set("presenceUsers", message.users);
-          this._clearTimer = Ember.run.debounce(
+          this._clearTimer = debounce(
             this,
             "clear",
             keepAliveDuration + bufferTime
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 e6861cdf6b..37abc00f30 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,3 +1,5 @@
+import { debounce } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -26,7 +28,7 @@ export default Component.extend({
       this.channel,
       message => {
         if (!this.isDestroyed) this.set("presenceUsers", message.users);
-        this._clearTimer = Ember.run.debounce(
+        this._clearTimer = debounce(
           this,
           "clear",
           keepAliveDuration + bufferTime
@@ -38,7 +40,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   _destroyed() {
-    Ember.run.cancel(this._clearTimer);
+    cancel(this._clearTimer);
     this.messageBus.unsubscribe(this.channel);
   },
 
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 262146ab3d..39573aa31b 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
@@ -84,7 +85,7 @@ QUnit.test("Tests the Composer controls", async assert => {
   event[mac ? "metaKey" : "ctrlKey"] = true;
   event.keyCode = 66;
 
-  Ember.run(() => textarea.dispatchEvent(event));
+  run(() => textarea.dispatchEvent(event));
 
   const example = I18n.t(`composer.bold_text`);
   assert.equal(
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 45a7114672..13725f4d6c 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -1,3 +1,4 @@
+import { run } from "@ember/runloop";
 import { acceptance, controllerFor } from "helpers/qunit-helpers";
 import showModal from "discourse/lib/show-modal";
 
@@ -37,7 +38,7 @@ QUnit.test("modal", async function(assert) {
     '{{#d-modal-body title="" class="" dismissable=false}}test{{/d-modal-body}}'
   );
 
-  Ember.run(() => showModal("not-dismissable", {}));
+  run(() => showModal("not-dismissable", {}));
 
   assert.ok(find(".d-modal:visible").length === 1, "modal should appear");
 
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index cb008f0323..8c6d936e89 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import componentTest from "helpers/component-test";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import formatTextWithSelection from "helpers/d-editor-helper";
@@ -747,7 +748,7 @@ composerTestCase("replace-text event for composer", async function(assert) {
         .lookup("service:app-events")
         .trigger("composer:replace-text", "green", "yellow", { forceFocus: true });
 
-      Ember.run.next(() => {
+      next(() => {
         let expect = formatTextWithSelection(AFTER, CASE.after);
         let actual = formatTextWithSelection(
           this.value,
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index f12da98666..695a204291 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -1,4 +1,5 @@
 import EmberObject from "@ember/object";
+import { next } from "@ember/runloop";
 import Topic from "discourse/models/topic";
 import PostStream from "discourse/models/post-stream";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
@@ -545,7 +546,7 @@ QUnit.test(
     const done = assert.async();
     controller.send("deletePost", post);
 
-    Ember.run.next(() => {
+    next(() => {
       assert.ok(destroyed, "post was destroyed");
       done();
     });
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 5e79f87647..ca1bd8363a 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,3 +1,5 @@
+import { run } from "@ember/runloop";
+import { later } from "@ember/runloop";
 /* global QUnit, resetSite */
 
 import sessionFixtures from "fixtures/session-fixtures";
@@ -155,7 +157,7 @@ export function controllerFor(controller, model) {
 export function asyncTestDiscourse(text, func) {
   QUnit.test(text, function(assert) {
     const done = assert.async();
-    Ember.run(() => {
+    run(() => {
       func.call(this, assert);
       done();
     });
@@ -206,7 +208,7 @@ export function waitFor(assert, callback, timeout) {
   timeout = timeout || 500;
 
   const done = assert.async();
-  Ember.run.later(() => {
+  later(() => {
     callback();
     done();
   }, timeout);
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index d64823cd2a..a40e803bd2 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -1,3 +1,4 @@
+import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "helpers/qunit-helpers";
@@ -173,7 +174,7 @@ QUnit.skip("restores the href after a while", async assert => {
   assert.timeout(75);
 
   const done = assert.async();
-  Ember.run.later(() => {
+  later(() => {
     assert.equal(fixture("a").attr("href"), "http://www.google.com");
     done();
   });
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js.es6
index 115417e4d4..429b669d7c 100644
--- a/test/javascripts/models/nav-item-test.js.es6
+++ b/test/javascripts/models/nav-item-test.js.es6
@@ -1,8 +1,9 @@
+import { run } from "@ember/runloop";
 import createStore from "helpers/create-store";
 
 QUnit.module("Discourse.NavItem", {
   beforeEach() {
-    Ember.run(function() {
+    run(function() {
       const asianCategory = Discourse.Category.create({
         name: "确实是这样",
         id: 343434
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5795795dc0..1f1f15a0d4 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -73,8 +73,7 @@ if (window.Logster) {
   window.Logster = { enabled: false };
 }
 
-var origDebounce = Ember.run.debounce,
-  pretender = require("helpers/create-pretender", null, null, false),
+var pretender = require("helpers/create-pretender", null, null, false),
   fixtures = require("fixtures/site-fixtures", null, null, false).default,
   flushMap = require("discourse/models/store", null, null, false).flushMap,
   ScrollingDOMMethods = require("discourse/mixins/scrolling", null, null, false)
@@ -137,15 +136,9 @@ QUnit.testStart(function(ctx) {
 
   // Unless we ever need to test this, let's leave it off.
   $.fn.autocomplete = function() {};
-
-  // Don't debounce in test unless we're testing debouncing
-  if (ctx.module.indexOf("debounce") === -1) {
-    Ember.run.debounce = Ember.run;
-  }
 });
 
 QUnit.testDone(function() {
-  Ember.run.debounce = origDebounce;
   window.sandbox.restore();
 
   // Destroy any modals
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6
index fcb35f96b9..4666285c27 100644
--- a/test/javascripts/widgets/widget-test.js.es6
+++ b/test/javascripts/widgets/widget-test.js.es6
@@ -1,3 +1,4 @@
+import { next } from "@ember/runloop";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 import { createWidget } from "discourse/widgets/widget";
 import { withPluginApi } from "discourse/lib/plugin-api";
@@ -159,7 +160,7 @@ widgetTest("widget update with promise", {
 
       click() {
         return new Ember.RSVP.Promise(resolve => {
-          Ember.run.next(() => {
+          next(() => {
             this.state.name = "Robin";
             resolve();
           });

From cacf99e144173367d6b7f19ab0ef1d52b44ba9f6 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 30 Oct 2019 13:54:48 +0000
Subject: [PATCH 233/328] FIX: Generate category url correctly when slugs are
 empty

---
 app/models/category.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 74a6d87fb5..8c216ac687 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -661,8 +661,8 @@ class Category < ActiveRecord::Base
     url = @@url_cache[self.id]
     unless url
       url = +"#{Discourse.base_uri}/c"
-      url << "/#{parent_category.slug}" if parent_category_id
-      url << "/#{slug}"
+      url << "/#{parent_category.slug_for_url}" if parent_category_id
+      url << "/#{slug_for_url}"
       @@url_cache[self.id] = -url
     end
 

From c3f06943c7aba8b2d751f5a03b0ce7c65a29454a Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Wed, 30 Oct 2019 09:33:07 -0500
Subject: [PATCH 234/328] FIX: Account for empty uploads directory upon backup
 restore (#8262)

This commit fixes a case where backup restores would fail if the uploads/default directory is empty.
---
 lib/backup_restore/restorer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 8d902da8a1..98ad91c1c5 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -436,6 +436,7 @@ module BackupRestore
         FileUtils.mkdir_p("uploads")
 
         tmp_uploads_path = Dir.glob(File.join(@tmp_directory, "uploads", "*")).first
+        return if tmp_uploads_path.blank?
         previous_db_name = BackupMetadata.value_for("db_name") || File.basename(tmp_uploads_path)
         current_db_name = RailsMultisite::ConnectionManagement.current_db
         optimized_images_exist = File.exist?(File.join(tmp_uploads_path, 'optimized'))

From 71918359891e23b17ff99626c47714e3e8027bc5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 30 Oct 2019 15:25:42 +0000
Subject: [PATCH 235/328] DEV: Support custom server-side names in rest models
 (#8265)

---
 .../discourse/adapters/rest.js.es6            | 10 ++++--
 .../javascripts/discourse/models/store.js.es6 | 22 +++++++++---
 test/javascripts/helpers/create-store.js.es6  |  3 +-
 .../javascripts/models/rest-model-test.js.es6 | 35 +++++++++++++++++++
 4 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index 3d86fe934c..5ace5dc40b 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -66,10 +66,14 @@ export default EmberObject.extend({
   pathFor(store, type, findArgs) {
     let path =
       this.basePath(store, type, findArgs) +
-      Ember.String.underscore(store.pluralize(type));
+      Ember.String.underscore(store.pluralize(this.apiNameFor(type)));
     return this.appendQueryParams(path, findArgs);
   },
 
+  apiNameFor(type) {
+    return type;
+  },
+
   findAll(store, type, findArgs) {
     return ajax(this.pathFor(store, type, findArgs)).catch(rethrow);
   },
@@ -104,7 +108,7 @@ export default EmberObject.extend({
 
   update(store, type, id, attrs) {
     const data = {};
-    const typeField = Ember.String.underscore(type);
+    const typeField = Ember.String.underscore(this.apiNameFor(type));
     data[typeField] = attrs;
 
     return ajax(
@@ -117,7 +121,7 @@ export default EmberObject.extend({
 
   createRecord(store, type, attrs) {
     const data = {};
-    const typeField = Ember.String.underscore(type);
+    const typeField = Ember.String.underscore(this.apiNameFor(type));
     data[typeField] = attrs;
     return ajax(this.pathFor(store, type), this.getPayload("POST", data)).then(
       function(json) {
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index a5caad53a1..841def676f 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -93,7 +93,12 @@ export default EmberObject.extend({
     if (typeof findArgs === "object") {
       return this._resultSet(type, result, findArgs);
     } else {
-      return this._hydrate(type, result[Ember.String.underscore(type)], result);
+      const apiName = this.adapterFor(type).apiNameFor(type);
+      return this._hydrate(
+        type,
+        result[Ember.String.underscore(apiName)],
+        result
+      );
     }
   },
 
@@ -147,8 +152,11 @@ export default EmberObject.extend({
   },
 
   refreshResults(resultSet, type, url) {
+    const adapter = this.adapterFor(type);
     return ajax(url).then(result => {
-      const typeName = Ember.String.underscore(this.pluralize(type));
+      const typeName = Ember.String.underscore(
+        this.pluralize(adapter.apiNameFor(type))
+      );
       const content = result[typeName].map(obj =>
         this._hydrate(type, obj, result)
       );
@@ -157,8 +165,11 @@ export default EmberObject.extend({
   },
 
   appendResults(resultSet, type, url) {
+    const adapter = this.adapterFor(type);
     return ajax(url).then(result => {
-      let typeName = Ember.String.underscore(this.pluralize(type));
+      const typeName = Ember.String.underscore(
+        this.pluralize(adapter.apiNameFor(type))
+      );
 
       let pageTarget = result.meta || result;
       let totalRows =
@@ -211,7 +222,10 @@ export default EmberObject.extend({
   },
 
   _resultSet(type, result, findArgs) {
-    const typeName = Ember.String.underscore(this.pluralize(type));
+    const adapter = this.adapterFor(type);
+    const typeName = Ember.String.underscore(
+      this.pluralize(adapter.apiNameFor(type))
+    );
     const content = result[typeName].map(obj =>
       this._hydrate(type, obj, result)
     );
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js.es6
index f0c55cd386..8eccc0d6ea 100644
--- a/test/javascripts/helpers/create-store.js.es6
+++ b/test/javascripts/helpers/create-store.js.es6
@@ -5,7 +5,7 @@ import TopicListAdapter from "discourse/adapters/topic-list";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import { buildResolver } from "discourse-common/resolver";
 
-export default function() {
+export default function(customLookup = () => {}) {
   const resolver = buildResolver("discourse").create();
 
   return Store.create({
@@ -34,6 +34,7 @@ export default function() {
           this._settings = this._settings || Discourse.SiteSettings;
           return this._settings;
         }
+        return customLookup(type);
       },
 
       lookupFactory(type) {
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index c737eb965a..c5e66c4867 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -2,6 +2,7 @@ QUnit.module("rest-model");
 
 import createStore from "helpers/create-store";
 import RestModel from "discourse/models/rest";
+import RestAdapter from "discourse/adapters/rest";
 
 QUnit.test("munging", assert => {
   const store = createStore();
@@ -101,3 +102,37 @@ QUnit.test("destroyRecord", assert => {
     });
   });
 });
+
+QUnit.test("custom api name", async assert => {
+  const store = createStore(type => {
+    if (type === "adapter:my-widget") {
+      return RestAdapter.extend({
+        // An adapter like this is used when the server-side key/url
+        // do not match the name of the es6 class
+        apiNameFor() {
+          return "widget";
+        }
+      }).create();
+    }
+  });
+
+  // The pretenders only respond to requests for `widget`
+  // If these basic tests pass, the name override worked correctly
+
+  //Create
+  const widget = store.createRecord("my-widget");
+  await widget.save({ name: "Evil Widget" });
+  assert.equal(widget.id, 100, "it saved a new record successully");
+  assert.equal(widget.get("name"), "Evil Widget");
+
+  // Update
+  await widget.update({ name: "new name" });
+  assert.equal(widget.get("name"), "new name");
+
+  // Destroy
+  await widget.destroyRecord();
+
+  // Lookup
+  const foundWidget = await store.find("my-widget", 123);
+  assert.equal(foundWidget.name, "Trout Lure");
+});

From 080e899b8c742524dd2a40eec26b1096597a9ef9 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 30 Oct 2019 16:57:13 +0100
Subject: [PATCH 236/328] DEV: Tag group improvements (#8252)

* DEV: Add the actual "tag_groups/new" route

Allows refreshing the "new" page without an error.

* DEV: Prevent attempts to create group tags if tagging is disabled

* DEV: Refactor the tag-groups controller

Gets rid of `selectedItem`, `selected`, and `selectTagGroup` action.

* DEV: Rename tag-groups-show to tag-groups-edit

* DEV: Refactor tag-groups form

* Extracted the tag-groups-form that's used by tag-groups-new and tag-groups-edit
* The model is now a buffered property
* Serialization relies more heavily on RestAdapter now
* Data is sent as JSON
* Payload is now namespaced ("tag_group")

* Update app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6

Co-Authored-By: Joffrey JAFFEUX <j.jaffeux@gmail.com>

* Update app/assets/javascripts/discourse/components/tag-groups-form.js.es6

Co-Authored-By: Joffrey JAFFEUX <j.jaffeux@gmail.com>

* Update app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6

Co-Authored-By: Joffrey JAFFEUX <j.jaffeux@gmail.com>
---
 .../admin/adapters/tag-group.js.es6           |  5 ++
 .../discourse/components/radio-button.js.es6  | 11 ++-
 .../components/tag-groups-form.js.es6         | 69 +++++++++++++++++
 .../controllers/tag-groups-edit.js.es6        | 15 ++++
 .../controllers/tag-groups-new.js.es6         | 14 ++++
 .../controllers/tag-groups-show.js.es6        | 28 -------
 .../discourse/controllers/tag-groups.js.es6   | 18 +----
 .../discourse/models/tag-group.js.es6         | 75 ++----------------
 .../discourse/routes/app-route-map.js.es6     |  3 +-
 ...ups-show.js.es6 => tag-groups-edit.js.es6} |  4 +
 .../discourse/routes/tag-groups-new.js.es6    | 17 ++++
 .../templates/components/tag-groups-form.hbs  | 77 +++++++++++++++++++
 .../discourse/templates/tag-groups-edit.hbs   |  1 +
 .../discourse/templates/tag-groups-new.hbs    |  1 +
 .../discourse/templates/tag-groups-show.hbs   | 50 ------------
 .../discourse/templates/tag-groups.hbs        | 11 ++-
 app/controllers/tag_groups_controller.rb      | 17 +++-
 config/routes.rb                              |  2 +-
 18 files changed, 246 insertions(+), 172 deletions(-)
 create mode 100644 app/assets/javascripts/admin/adapters/tag-group.js.es6
 create mode 100644 app/assets/javascripts/discourse/components/tag-groups-form.js.es6
 create mode 100644 app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
 create mode 100644 app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
 delete mode 100644 app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
 rename app/assets/javascripts/discourse/routes/{tag-groups-show.js.es6 => tag-groups-edit.js.es6} (73%)
 create mode 100644 app/assets/javascripts/discourse/routes/tag-groups-new.js.es6
 create mode 100644 app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
 create mode 100644 app/assets/javascripts/discourse/templates/tag-groups-edit.hbs
 create mode 100644 app/assets/javascripts/discourse/templates/tag-groups-new.hbs
 delete mode 100644 app/assets/javascripts/discourse/templates/tag-groups-show.hbs

diff --git a/app/assets/javascripts/admin/adapters/tag-group.js.es6 b/app/assets/javascripts/admin/adapters/tag-group.js.es6
new file mode 100644
index 0000000000..2e950aa2c1
--- /dev/null
+++ b/app/assets/javascripts/admin/adapters/tag-group.js.es6
@@ -0,0 +1,5 @@
+import RestAdapter from "discourse/adapters/rest";
+
+export default RestAdapter.extend({
+  jsonMode: true
+});
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js.es6
index 3f6d5a6109..b6d44b4a99 100644
--- a/app/assets/javascripts/discourse/components/radio-button.js.es6
+++ b/app/assets/javascripts/discourse/components/radio-button.js.es6
@@ -14,10 +14,15 @@ export default Component.extend({
 
   click() {
     const value = $(this.element).val();
-    if (this.selection === value) {
-      this.set("selection", undefined);
+
+    if (this.onChange) {
+      this.onChange(value);
+    } else {
+      if (this.selection === value) {
+        this.set("selection", undefined);
+      }
+      this.set("selection", value);
     }
-    this.set("selection", value);
   },
 
   @computed("value", "selection")
diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js.es6 b/app/assets/javascripts/discourse/components/tag-groups-form.js.es6
new file mode 100644
index 0000000000..4d932e1d69
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/tag-groups-form.js.es6
@@ -0,0 +1,69 @@
+import Component from "@ember/component";
+import computed from "ember-addons/ember-computed-decorators";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import PermissionType from "discourse/models/permission-type";
+
+export default Component.extend(bufferedProperty("model"), {
+  tagName: "",
+
+  @computed("buffered.isSaving", "buffered.name", "buffered.tag_names")
+  savingDisabled(isSaving, name, tagNames) {
+    return isSaving || Ember.isEmpty(name) || Ember.isEmpty(tagNames);
+  },
+
+  actions: {
+    setPermissions(permissionName) {
+      if (permissionName === "private") {
+        this.buffered.set("permissions", {
+          staff: PermissionType.FULL
+        });
+      } else if (permissionName === "visible") {
+        this.buffered.set("permissions", {
+          staff: PermissionType.FULL,
+          everyone: PermissionType.READONLY
+        });
+      } else {
+        this.buffered.set("permissions", {
+          everyone: PermissionType.FULL
+        });
+      }
+    },
+
+    save() {
+      const attrs = this.buffered.getProperties(
+        "name",
+        "tag_names",
+        "parent_tag_name",
+        "one_per_topic",
+        "permissions"
+      );
+
+      this.model.save(attrs).then(() => {
+        this.commitBuffer();
+
+        if (this.onSave) {
+          this.onSave();
+        }
+      });
+    },
+
+    destroy() {
+      return bootbox.confirm(
+        I18n.t("tagging.groups.confirm_delete"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        destroy => {
+          if (!destroy) {
+            return;
+          }
+
+          this.model.destroyRecord().then(() => {
+            if (this.onDestroy) {
+              this.onDestroy();
+            }
+          });
+        }
+      );
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
new file mode 100644
index 0000000000..067a2f615b
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
@@ -0,0 +1,15 @@
+import { inject } from "@ember/controller";
+import Controller from "@ember/controller";
+
+export default Controller.extend({
+  tagGroups: inject(),
+
+  actions: {
+    onDestroy() {
+      const tagGroups = this.tagGroups.model;
+      tagGroups.removeObject(this.model);
+
+      this.transitionToRoute("tagGroups.index");
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
new file mode 100644
index 0000000000..e4a3a0187e
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
@@ -0,0 +1,14 @@
+import Controller from "@ember/controller";
+
+export default Controller.extend({
+  tagGroups: Ember.inject.controller(),
+
+  actions: {
+    onSave() {
+      const tagGroups = this.tagGroups.model;
+      tagGroups.pushObject(this.model);
+
+      this.transitionToRoute("tagGroups.edit", this.model);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
deleted file mode 100644
index 9ebdef5d92..0000000000
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ /dev/null
@@ -1,28 +0,0 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
-export default Controller.extend({
-  tagGroups: inject(),
-
-  actions: {
-    save() {
-      this.model.save();
-    },
-
-    destroy() {
-      return bootbox.confirm(
-        I18n.t("tagging.groups.confirm_delete"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        destroy => {
-          if (destroy) {
-            const c = this.get("tagGroups.model");
-            return this.model.destroy().then(() => {
-              c.removeObject(this.model);
-              this.transitionToRoute("tagGroups");
-            });
-          }
-        }
-      );
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
index cfde9214ea..725f8846f1 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
@@ -1,25 +1,9 @@
 import Controller from "@ember/controller";
-import TagGroup from "discourse/models/tag-group";
 
 export default Controller.extend({
   actions: {
-    selectTagGroup(tagGroup) {
-      if (this.selectedItem) {
-        this.selectedItem.set("selected", false);
-      }
-      this.set("selectedItem", tagGroup);
-      tagGroup.set("selected", true);
-      tagGroup.set("savingStatus", null);
-      this.transitionToRoute("tagGroups.show", tagGroup);
-    },
-
     newTagGroup() {
-      const newTagGroup = TagGroup.create({
-        id: "new",
-        name: I18n.t("tagging.groups.new_name")
-      });
-      this.model.pushObject(newTagGroup);
-      this.send("selectTagGroup", newTagGroup);
+      this.transitionToRoute("tagGroups.new");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js.es6
index 6d0579a1b9..e42ccee9dd 100644
--- a/app/assets/javascripts/discourse/models/tag-group.js.es6
+++ b/app/assets/javascripts/discourse/models/tag-group.js.es6
@@ -1,77 +1,18 @@
-import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import computed from "ember-addons/ember-computed-decorators";
 import PermissionType from "discourse/models/permission-type";
 
 export default RestModel.extend({
-  @computed("name", "tag_names", "saving")
-  disableSave(name, tagNames, saving) {
-    return saving || Ember.isEmpty(name) || Ember.isEmpty(tagNames);
-  },
-
-  @computed("id")
-  disableDelete(id) {
-    return !parseInt(id);
-  },
-
   @computed("permissions")
-  permissionName: {
-    get(permissions) {
-      if (!permissions) return "public";
+  permissionName(permissions) {
+    if (!permissions) return "public";
 
-      if (permissions["everyone"] === PermissionType.FULL) {
-        return "public";
-      } else if (permissions["everyone"] === PermissionType.READONLY) {
-        return "visible";
-      } else {
-        return "private";
-      }
-    },
-
-    set(value) {
-      if (value === "private") {
-        this.set("permissions", { staff: PermissionType.FULL });
-      } else if (value === "visible") {
-        this.set("permissions", {
-          staff: PermissionType.FULL,
-          everyone: PermissionType.READONLY
-        });
-      } else {
-        this.set("permissions", { everyone: PermissionType.FULL });
-      }
+    if (permissions["everyone"] === PermissionType.FULL) {
+      return "public";
+    } else if (permissions["everyone"] === PermissionType.READONLY) {
+      return "visible";
+    } else {
+      return "private";
     }
-  },
-
-  save() {
-    this.set("savingStatus", I18n.t("saving"));
-    this.set("saving", true);
-
-    const isNew = this.id === "new";
-    const url = isNew ? "/tag_groups" : `/tag_groups/${this.id}`;
-    const data = this.getProperties(
-      "name",
-      "tag_names",
-      "parent_tag_name",
-      "one_per_topic",
-      "permissions"
-    );
-
-    return ajax(url, {
-      data,
-      type: isNew ? "POST" : "PUT"
-    })
-      .then(result => {
-        if (result.tag_group && result.tag_group.id) {
-          this.set("id", result.tag_group.id);
-        }
-      })
-      .finally(() => {
-        this.set("savingStatus", I18n.t("saved"));
-        this.set("saving", false);
-      });
-  },
-
-  destroy() {
-    return ajax(`/tag_groups/${this.id}`, { type: "DELETE" });
   }
 });
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 d29d77463b..2bc476425c 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -223,7 +223,8 @@ export default function() {
     "tagGroups",
     { path: "/tag_groups", resetNamespace: true },
     function() {
-      this.route("show", { path: "/:id" });
+      this.route("edit", { path: "/:id" });
+      this.route("new");
     }
   );
 
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6
similarity index 73%
rename from app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6
index 7593f364be..a923282cce 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6
@@ -5,5 +5,9 @@ export default DiscourseRoute.extend({
 
   model(params) {
     return this.store.find("tagGroup", params.id);
+  },
+
+  afterModel(tagGroup) {
+    tagGroup.set("savingStatus", null);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-new.js.es6
new file mode 100644
index 0000000000..64c460f512
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/tag-groups-new.js.es6
@@ -0,0 +1,17 @@
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
+  showFooter: true,
+
+  beforeModel() {
+    if (!this.siteSettings.tagging_enabled) {
+      this.transitionTo("tagGroups");
+    }
+  },
+
+  model() {
+    return this.store.createRecord("tagGroup", {
+      name: I18n.t("tagging.groups.new_name")
+    });
+  }
+});
diff --git a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
new file mode 100644
index 0000000000..b6b724f05e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
@@ -0,0 +1,77 @@
+<div class="tag-group-content">
+  <h1>{{text-field value=buffered.name}}</h1>
+  <br/>
+
+  <section class="group-tags-list">
+    <label>{{i18n 'tagging.groups.tags_label'}}</label><br/>
+    {{tag-chooser
+      tags=buffered.tag_names
+      everyTag=true
+      allowCreate=true
+      filterPlaceholder="tagging.groups.tags_placeholder"
+      unlimitedTagCount=true}}
+  </section>
+
+  <section class="parent-tag-section">
+    <label>{{i18n 'tagging.groups.parent_tag_label'}}</label>
+    {{tag-chooser
+      tags=buffered.parent_tag_name
+      everyTag=true
+      maximum=1
+      allowCreate=true
+      filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
+    <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'}}
+    </label>
+  </section>
+
+  <section class="group-visibility">
+    <div>
+      {{radio-button
+        class="tag-permissions-choice"
+        name="tag-permissions-choice"
+        value="public"
+        id="public-permission"
+        selection=buffered.permissionName
+        onChange=(action "setPermissions")}}
+
+      <label class="radio" for="public-permission">
+        {{i18n 'tagging.groups.everyone_can_use'}}
+      </label>
+    </div>
+    <div>
+      {{radio-button
+        class="tag-permissions-choice"
+        name="tag-permissions-choice"
+        value="visible"
+        id="visible-permission"
+        selection=buffered.permissionName
+        onChange=(action "setPermissions")}}
+
+      <label class="radio" for="visible-permission">
+        {{i18n 'tagging.groups.usable_only_by_staff'}}
+      </label>
+    </div>
+    <div>
+      {{radio-button
+        class="tag-permissions-choice"
+        name="tag-permissions-choice"
+        value="private"
+        id="private-permission"
+        selection=buffered.permissionName
+        onChange=(action "setPermissions")}}
+
+      <label class="radio" for="private-permission">
+        {{i18n 'tagging.groups.visible_only_to_staff'}}
+      </label>
+    </div>
+  </section>
+
+  <button {{action "save"}} disabled={{savingDisabled}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button>
+  <button {{action "destroy"}} disabled={{buffered.isNew}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'tagging.groups.delete'}}</button>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-edit.hbs b/app/assets/javascripts/discourse/templates/tag-groups-edit.hbs
new file mode 100644
index 0000000000..b6b0e9adb1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/tag-groups-edit.hbs
@@ -0,0 +1 @@
+{{tag-groups-form model=model onDestroy=(action "onDestroy")}}
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-new.hbs b/app/assets/javascripts/discourse/templates/tag-groups-new.hbs
new file mode 100644
index 0000000000..172d8c7748
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/tag-groups-new.hbs
@@ -0,0 +1 @@
+{{tag-groups-form model=model onSave=(action "onSave")}}
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
deleted file mode 100644
index 7695305039..0000000000
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="tag-group-content">
-  <h1>{{text-field value=model.name}}</h1>
-  <br/>
-  <section class="group-tags-list">
-    <label>{{i18n 'tagging.groups.tags_label'}}</label><br/>
-    {{tag-chooser
-      tags=model.tag_names
-      everyTag=true
-      allowCreate=true
-      filterPlaceholder="tagging.groups.tags_placeholder"
-      unlimitedTagCount=true}}
-  </section>
-
-  <section class="parent-tag-section">
-    <label>{{i18n 'tagging.groups.parent_tag_label'}}</label>
-    {{tag-chooser
-      tags=model.parent_tag_name
-      everyTag=true
-      maximum=1
-      allowCreate=true
-      filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
-    <span class="description">{{i18n 'tagging.groups.parent_tag_description'}}</span>
-  </section>
-
-  <section class="group-one-per-topic">
-    <label>
-      {{input type="checkbox" checked=model.one_per_topic name="onepertopic"}}
-      {{i18n 'tagging.groups.one_per_topic_label'}}
-    </label>
-  </section>
-
-  <section class="group-visibility">
-    <div>
-      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="public" id="public-permission" selection=model.permissionName}}
-      <label class="radio" for="public-permission">{{i18n 'tagging.groups.everyone_can_use'}}</label>
-    </div>
-    <div>
-      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="visible" id="visible-permission" selection=model.permissionName}}
-      <label class="radio" for="visible-permission">{{i18n 'tagging.groups.usable_only_by_staff'}}</label>
-    </div>
-    <div>
-      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="private" id="private-permission" selection=model.permissionName}}
-      <label class="radio" for="private-permission">{{i18n 'tagging.groups.visible_only_to_staff'}}</label>
-    </div>
-  </section>
-
-  <button {{action "save"}} disabled={{model.disableSave}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button>
-  <button {{action "destroy"}} disabled={{model.disableDelete}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'tagging.groups.delete'}}</button>
-  <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
-</div>
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs
index 6c49ad8aaf..bbb1d78c3e 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs
@@ -4,10 +4,17 @@
   <div class='content-list'>
     <ul>
       {{#each model as |tagGroup|}}
-        <li><a {{action "selectTagGroup" tagGroup}} class="{{if tagGroup.selected 'active'}}">{{tagGroup.name}}</a></li>
+        <li>
+          {{#link-to "tagGroups.edit" tagGroup}}
+            {{tagGroup.name}}
+          {{/link-to}}
+        </li>
       {{/each}}
     </ul>
-    <button {{action "newTagGroup"}} class='btn btn-default'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button>
+
+    {{#if this.siteSettings.tagging_enabled}}
+      <button {{action "newTagGroup"}} class='btn btn-default'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button>
+    {{/if}}
   </div>
 
   {{outlet}}
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index f0677769c4..6b87032fa7 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 class TagGroupsController < ApplicationController
-
   requires_login
   before_action :ensure_staff
 
-  skip_before_action :check_xhr, only: [:index, :show]
+  skip_before_action :check_xhr, only: [:index, :show, :new]
   before_action :fetch_tag_group, only: [:show, :update, :destroy]
 
   def index
@@ -31,6 +30,13 @@ class TagGroupsController < ApplicationController
     end
   end
 
+  def new
+    tag_groups = TagGroup.order('name ASC').includes(:parent_tag).preload(:tags).all
+    serializer = ActiveModel::ArraySerializer.new(tag_groups, each_serializer: TagGroupSerializer, root: 'tag_groups')
+    store_preloaded "tagGroup", MultiJson.dump(serializer)
+    render "default/empty"
+  end
+
   def create
     guardian.ensure_can_admin_tag_groups!
     @tag_group = TagGroup.new(tag_groups_params)
@@ -73,6 +79,9 @@ class TagGroupsController < ApplicationController
   end
 
   def tag_groups_params
+    tag_group = params.delete(:tag_group)
+    params.merge!(tag_group.permit!) if tag_group
+
     if permissions = params[:permissions]
       permissions.each do |k, v|
         permissions[k] = v.to_i
@@ -87,9 +96,11 @@ class TagGroupsController < ApplicationController
       parent_tag_name: [],
       permissions: permissions&.keys,
     )
+
     result[:tag_names] ||= []
     result[:parent_tag_name] ||= []
-    result[:one_per_topic] = (params[:one_per_topic] == "true")
+    result[:one_per_topic] = params[:one_per_topic].in?([true, "true"])
+
     result
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 7e5fd73d08..44594aa6ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -845,7 +845,7 @@ Discourse::Application.routes.draw do
     end
   end
 
-  resources :tag_groups, constraints: StaffConstraint.new, except: [:new, :edit] do
+  resources :tag_groups, constraints: StaffConstraint.new, except: [:edit] do
     collection do
       get '/filter/search' => 'tag_groups#search'
     end

From 965662d215dba3a4c76a5cfcd12a06a4d5a38a57 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 30 Oct 2019 12:56:25 -0400
Subject: [PATCH 237/328] Prettify server.en.yml

---
 config/locales/server.en.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9c5a9917e6..d4506b8ded 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -892,18 +892,18 @@ en:
 
   webauthn:
     validation:
-      invalid_type_error: 'The webauthn type provided was invalid. Valid types are webauthn.get and webauthn.create.'
-      challenge_mismatch_error: 'The provided challenge does not match the challenge generated by the authentication server.'
-      invalid_origin_error: 'The origin of the authentication request does not match the server origin.'
-      malformed_attestation_error: 'There was an error decoding the attestation data.'
-      invalid_relying_party_id_error: 'The Relying Party ID of the authentication request does not match the server Relying Party ID.'
-      user_verification_error: 'User verification is required.'
-      unsupported_public_key_algorithm_error: 'The provided public key algorithm is not supported by the server.'
-      unsupported_attestation_format_error: 'The attestation format is not supported by the server.'
-      credential_id_in_use_error: 'The credential ID provided is already in use.'
-      public_key_error: 'The public key verification for the credential failed.'
-      ownership_error: 'The security key is not owned by the user.'
-      not_found_error: 'A security key with the provided credential ID could not be found.'
+      invalid_type_error: "The webauthn type provided was invalid. Valid types are webauthn.get and webauthn.create."
+      challenge_mismatch_error: "The provided challenge does not match the challenge generated by the authentication server."
+      invalid_origin_error: "The origin of the authentication request does not match the server origin."
+      malformed_attestation_error: "There was an error decoding the attestation data."
+      invalid_relying_party_id_error: "The Relying Party ID of the authentication request does not match the server Relying Party ID."
+      user_verification_error: "User verification is required."
+      unsupported_public_key_algorithm_error: "The provided public key algorithm is not supported by the server."
+      unsupported_attestation_format_error: "The attestation format is not supported by the server."
+      credential_id_in_use_error: "The credential ID provided is already in use."
+      public_key_error: "The public key verification for the credential failed."
+      ownership_error: "The security key is not owned by the user."
+      not_found_error: "A security key with the provided credential ID could not be found."
 
   topic_flag_types:
     spam:
@@ -1583,9 +1583,9 @@ en:
     github_client_id: "Client id for Github authentication, registered at <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Client secret for Github authentication, registered at <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
 
-    enable_discord_logins: 'Allow users to authenticate using Discord?'
+    enable_discord_logins: "Allow users to authenticate using Discord?"
     discord_client_id: 'Discord Client ID (need one? visit <a href="https://discordapp.com/developers/applications/me">the Discord developer portal</a>)'
-    discord_secret: 'Discord Secret Key'
+    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"
@@ -4661,4 +4661,4 @@ en:
     html_missing_placeholder: "The html template must include %{placeholder}"
 
   discord:
-    not_in_allowed_guild: 'Authentication failed. You are not a member of a permitted Discord guild.'
+    not_in_allowed_guild: "Authentication failed. You are not a member of a permitted Discord guild."

From 580a4a827b05e4d91b72abb4a16ac10a04848591 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 30 Oct 2019 13:07:16 -0400
Subject: [PATCH 238/328] Exclude audio/video URLs from search result blurbs

Displays translatable "[audio]" or "[video]" placeholders instead of ugly (and often long) URLs.
---
 config/locales/server.en.yml         |  2 ++
 lib/search/grouped_search_results.rb |  8 ++++++++
 spec/lib/search_spec.rb              | 28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d4506b8ded..4686244be0 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2165,6 +2165,8 @@ en:
       topic: "Results"
       user: "Users"
     results_page: "Search results for '%{term}'"
+    audio: "[audio]"
+    video: "[video]"
 
   sso:
     login_error: "Login Error"
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 23a605f2cf..eb3454c975 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -76,6 +76,14 @@ class Search
       blurb = nil
       cooked = SearchIndexer.scrub_html_for_search(cooked)
 
+      urls = Set.new
+      cooked.scan(URI.regexp(%w{http https})) { urls << $& }
+
+      urls.each do |url|
+        cooked.gsub!(url, I18n.t("search.video")) if url.match(/.(mov|mp4|webm|ogv)/)
+        cooked.gsub!(url, I18n.t("search.audio")) if url.match(/.(mp3|ogg|wav|m4a)/)
+      end
+
       if term
         terms = term.split(/\s+/)
         phrase = terms.first
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index 5108b82f1d..e78f75faf4 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -15,4 +15,32 @@ describe Search do
     end
   end
 
+  context "#GroupedSearchResults.blurb_for" do
+    it "strips audio and video URLs from search blurb" do
+      cooked = <<~RAW
+        link to an external page: https://google.com/?u=bar
+
+        link to an audio file: https://somesite.com/content/file123.m4a
+
+        link to a video file: https://somesite.com/content/somethingelse.mov
+      RAW
+      result = Search::GroupedSearchResults.blurb_for(cooked)
+      expect(result).to eq("link to an external page: https://google.com/?u=bar link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")}")
+    end
+
+    it "strips URLs correctly when blurb is" do
+      cooked = <<~RAW
+        Here goes a test cooked with enough characters to hit the blurb limit.
+
+        Something is very interesting about this audio file.
+
+        http://localhost/uploads/default/original/1X/90adc0092b30c04b761541bc0322d0dce3d896e7.m4a
+      RAW
+
+      result = Search::GroupedSearchResults.blurb_for(cooked)
+      expect(result).to eq("Here goes a test cooked with enough characters to hit the blurb limit. Something is very interesting about this audio file. #{I18n.t("search.audio")}")
+    end
+
+  end
+
 end

From 32107a9a72c08ca21f3cc9eb4f4beb13b9224279 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 30 Oct 2019 14:45:34 +0000
Subject: [PATCH 239/328] FIX: Correct slug validation

We were allowing new categories to use slugs like "2342-category".
---
 app/models/category.rb                |  9 +++++----
 spec/requests/list_controller_spec.rb | 12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 8c216ac687..ecec90e437 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -294,10 +294,11 @@ class Category < ActiveRecord::Base
       self.slug = Slug.for(name, '')
       self.slug = '' if duplicate_slug?
     end
-    # only allow to use category itself id. new_record doesn't have a id.
-    unless new_record?
-      match_id = /^(\d+)-category/.match(self.slug)
-      errors.add(:slug, :invalid) if match_id && match_id[1] && match_id[1] != self.id.to_s
+
+    # only allow to use category itself id.
+    match_id = /^(\d+)-/.match(self.slug)
+    if match_id.present?
+      errors.add(:slug, :invalid) if new_record? || (match_id[1] != self.id.to_s)
     end
   end
 
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 9727a06d4c..279acbff67 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -400,7 +400,17 @@ RSpec.describe ListController do
 
       context 'another category exists with a number at the beginning of its name' do
         # One category has another category's id at the beginning of its name
-        let!(:other_category) { Fabricate(:category_with_definition, name: "#{category.id} 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
+          }
+        }
 
         it 'uses the correct category' do
           get "/c/#{other_category.slug}/l/latest.json"

From 1772682b0a37c951f50db9f6b50616c3df3139ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 30 Oct 2019 19:09:25 +0100
Subject: [PATCH 240/328] FIX: ensure there's an excerpt before showing the bio

---
 .../discourse/templates/components/user-card-contents.hbs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 96ec1845a5..a4602fa48e 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -133,7 +133,7 @@
               </div>
             </div>
           {{else}}
-            {{#if user.bio_cooked}}
+            {{#if user.bio_excerpt}}
               <div class='bio'>{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
             {{/if}}
           {{/if}}

From e7eeb7c47fe5940a8e948b05222b365b92b54ad0 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 30 Oct 2019 14:36:45 -0400
Subject: [PATCH 241/328] Update log banner close from div to button

---
 .../javascripts/discourse/components/global-notice.js.es6       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 1b288f5429..e16243f207 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -67,7 +67,7 @@ export default Component.extend(
         notices.push([
           LogsNotice.currentProp("message"),
           "alert-logs-notice",
-          `<div class='close'>${iconHTML("times")}</div>`
+          `<button class='btn btn-flat close'>${iconHTML("times")}</button>`
         ]);
       }
 

From ba4b557114d7116bd70f172904c339c2f53f7fbb Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Wed, 30 Oct 2019 14:03:08 -0500
Subject: [PATCH 242/328] DEV: Remove Ember.Mixin to import @ember/object/mixin
 (#8269)

---
 .../javascripts/admin/mixins/penalty-controller.js.es6      | 3 ++-
 .../javascripts/admin/mixins/period-computation.js.es6      | 3 ++-
 .../javascripts/admin/mixins/setting-component.js.es6       | 3 ++-
 app/assets/javascripts/admin/mixins/setting-object.js.es6   | 3 ++-
 app/assets/javascripts/discourse-loader.js                  | 1 +
 .../javascripts/discourse/mixins/buffered-content.js.es6    | 3 ++-
 .../discourse/mixins/bulk-topic-selection.js.es6            | 3 ++-
 .../javascripts/discourse/mixins/can-check-emails.js.es6    | 3 ++-
 .../javascripts/discourse/mixins/card-contents-base.js.es6  | 3 ++-
 app/assets/javascripts/discourse/mixins/cleans-up.js.es6    | 3 ++-
 app/assets/javascripts/discourse/mixins/docking.js.es6      | 4 +++-
 .../discourse/mixins/grant-badge-controller.js.es6          | 3 ++-
 app/assets/javascripts/discourse/mixins/load-more.js.es6    | 3 ++-
 .../discourse/mixins/mobile-scroll-direction.js.es6         | 3 ++-
 .../javascripts/discourse/mixins/modal-functionality.js.es6 | 3 ++-
 .../javascripts/discourse/mixins/name-validation.js.es6     | 3 ++-
 .../javascripts/discourse/mixins/open-composer.js.es6       | 3 ++-
 app/assets/javascripts/discourse/mixins/pan-events.js.es6   | 3 ++-
 .../javascripts/discourse/mixins/password-validation.js.es6 | 3 ++-
 .../discourse/mixins/preferences-tab-controller.js.es6      | 3 ++-
 app/assets/javascripts/discourse/mixins/scroll-top.js.es6   | 3 ++-
 app/assets/javascripts/discourse/mixins/scrolling.js.es6    | 3 ++-
 app/assets/javascripts/discourse/mixins/singleton.js.es6    | 4 +++-
 app/assets/javascripts/discourse/mixins/upload.js.es6       | 6 ++++--
 .../discourse/mixins/user-fields-validation.js.es6          | 3 ++-
 .../javascripts/discourse/mixins/username-validation.js.es6 | 3 ++-
 .../components/future-date-input-selector/mixin.js.es6      | 3 ++-
 app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 | 3 ++-
 app/assets/javascripts/select-kit/mixins/events.js.es6      | 3 ++-
 app/assets/javascripts/select-kit/mixins/plugin-api.js.es6  | 4 +++-
 app/assets/javascripts/select-kit/mixins/tags.js.es6        | 3 ++-
 app/assets/javascripts/select-kit/mixins/utils.js.es6       | 3 ++-
 32 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index b38e249da3..e418887da2 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,7 +1,8 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create(ModalFunctionality, {
+export default Mixin.create(ModalFunctionality, {
   reason: null,
   message: null,
   postEdit: null,
diff --git a/app/assets/javascripts/admin/mixins/period-computation.js.es6 b/app/assets/javascripts/admin/mixins/period-computation.js.es6
index 4323532e84..01d903f373 100644
--- a/app/assets/javascripts/admin/mixins/period-computation.js.es6
+++ b/app/assets/javascripts/admin/mixins/period-computation.js.es6
@@ -1,7 +1,8 @@
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   queryParams: ["period"],
   period: "monthly",
 
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index c25efa99db..28d3e1525d 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -1,5 +1,6 @@
 import computed from "ember-addons/ember-computed-decorators";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
+import Mixin from '@ember/object/mixin';
 
 const CUSTOM_TYPES = [
   "bool",
@@ -19,7 +20,7 @@ const CUSTOM_TYPES = [
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   classNameBindings: [":row", ":setting", "overridden", "typeClass"],
   content: Ember.computed.alias("setting"),
   validationMessage: null,
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js.es6
index ef047af732..ec91a5ad01 100644
--- a/app/assets/javascripts/admin/mixins/setting-object.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-object.js.es6
@@ -1,6 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   @computed("value", "default")
   overridden(val, defaultVal) {
     if (val === null) val = "";
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 68128b1f6a..cb83e8aa4e 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -12,6 +12,7 @@ var define, requirejs;
         inject: Ember.inject.controller
       },
       "@ember/object": { default: Ember.Object },
+      "@ember/object/mixin": { default: Ember.Mixin },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
       "@ember/routing/route": { default: Ember.Route },
       "@ember/runloop": {
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
index 99364df7a9..08723e1486 100644
--- a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
+++ b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
@@ -1,4 +1,5 @@
 import EmberObjectProxy from "@ember/object/proxy";
+import Mixin from "@ember/object/mixin";
 
 /* global BufferedProxy: true */
 export function bufferedProperty(property) {
@@ -21,7 +22,7 @@ export function bufferedProperty(property) {
   // It's a good idea to null out fields when declaring objects
   mixin.property = null;
 
-  return Ember.Mixin.create(mixin);
+  return Mixin.create(mixin);
 }
 
 export default bufferedProperty("content");
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
index 411dfb6688..b03bf1f86f 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -1,7 +1,8 @@
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { on } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   bulkSelectEnabled: false,
   selected: null,
 
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index a7eb59fe7b..f3af56a3ec 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -1,6 +1,7 @@
 import { propertyEqual, setting } from "discourse/lib/computed";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("moderators_view_emails"),
   canStaffCheckEmails: Ember.computed.and(
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 69bafea2fb..dae6c1edc1 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -4,8 +4,9 @@ import { schedule } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   elementId: null, //click detection added for data-{elementId}
   triggeringLinkClass: null, //the <a> classname where this card should appear
   _showCallback: null, //username, $target - load up data for when show is called, should call this._positionCard($target) when it's done.
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
index 8392aacf27..2d229620b3 100644
--- a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
+++ b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
@@ -1,6 +1,7 @@
+import Mixin from '@ember/object/mixin';
 // Include this mixin if you want to be notified when the dom should be
 // cleaned (usually on route change.)
-export default Ember.Mixin.create({
+export default Mixin.create({
   _initializeChooser: Ember.on("didInsertElement", function() {
     this.appEvents.on("dom:clean", this, "cleanUp");
   }),
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js.es6
index 18a5ae5bf6..6bc0250d0c 100644
--- a/app/assets/javascripts/discourse/mixins/docking.js.es6
+++ b/app/assets/javascripts/discourse/mixins/docking.js.es6
@@ -1,4 +1,6 @@
+import Mixin from '@ember/object/mixin';
 import { debounce } from "@ember/runloop";
+
 const helper = {
   offset() {
     const mainOffset = $("#main").offset();
@@ -7,7 +9,7 @@ const helper = {
   }
 };
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   queueDockCheck: null,
 
   init() {
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
index cc0d82fd87..f13b88dc54 100644
--- a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -1,8 +1,9 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UserBadge from "discourse/models/user-badge";
 import { convertIconClass } from "discourse-common/lib/icon-library";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   @computed("allBadges.[]", "userBadges.[]")
   grantableBadges(allBadges, userBadges) {
     const granted = userBadges.reduce((map, badge) => {
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6
index caf86100ea..9872914aec 100644
--- a/app/assets/javascripts/discourse/mixins/load-more.js.es6
+++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6
@@ -1,9 +1,10 @@
 import Eyeline from "discourse/lib/eyeline";
 import Scrolling from "discourse/mixins/scrolling";
 import { on } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
 // Provides the ability to load more items for a view which is scrolled to the bottom.
-export default Ember.Mixin.create(Scrolling, {
+export default Mixin.create(Scrolling, {
   scrolled() {
     const eyeline = this.eyeline;
     return eyeline && eyeline.update();
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
index edd93096f0..96534bcda8 100644
--- a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
+++ b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
@@ -1,8 +1,9 @@
 import { debounce } from "@ember/runloop";
+import Mixin from '@ember/object/mixin';
 // Small buffer so that very tiny scrolls don't trigger mobile header switch
 const MOBILE_SCROLL_TOLERANCE = 5;
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   _lastScroll: null,
   _bottomHit: 0,
 
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
index cb4ba7717f..0f8e860234 100644
--- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
+++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
@@ -1,6 +1,7 @@
 import showModal from "discourse/lib/show-modal";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   flash(text, messageClass) {
     this.appEvents.trigger("modal-body:flash", { text, messageClass });
   },
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
index 5b505c1359..45bf59750a 100644
--- a/app/assets/javascripts/discourse/mixins/name-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
@@ -1,7 +1,8 @@
 import InputValidation from "discourse/models/input-validation";
 import { default as computed } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   @computed()
   nameInstructions() {
     return I18n.t(
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
index 29a4aca243..4bd5100cf5 100644
--- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6
+++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
@@ -1,7 +1,8 @@
 // This mixin allows a route to open the composer
 import Composer from "discourse/models/composer";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   openComposer(controller) {
     let categoryId = controller.get("category.id");
     if (
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js.es6 b/app/assets/javascripts/discourse/mixins/pan-events.js.es6
index 1608d72fea..4fa81a7117 100644
--- a/app/assets/javascripts/discourse/mixins/pan-events.js.es6
+++ b/app/assets/javascripts/discourse/mixins/pan-events.js.es6
@@ -1,3 +1,4 @@
+import Mixin from '@ember/object/mixin';
 /**
    Pan events is a mixin that allows components to detect and respond to swipe gestures
    It fires callbacks for panStart, panEnd, panMove with the pan state, and the original event.
@@ -6,7 +7,7 @@ export const SWIPE_VELOCITY = 40;
 export const SWIPE_DISTANCE_THRESHOLD = 50;
 export const SWIPE_VELOCITY_THRESHOLD = 0.12;
 export const MINIMUM_SWIPE_DISTANCE = 5;
-export default Ember.Mixin.create({
+export default Mixin.create({
   //velocity is pixels per ms
 
   _panState: null,
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
index 50a98e8790..fdd27bb640 100644
--- a/app/assets/javascripts/discourse/mixins/password-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
@@ -1,7 +1,8 @@
 import InputValidation from "discourse/models/input-validation";
 import { default as computed } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   rejectedPasswords: null,
 
   init() {
diff --git a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6 b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
index 080c81fe9f..0c602e83c5 100644
--- a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
@@ -1,6 +1,7 @@
 import { default as computed } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   saved: false,
 
   @computed("model.isSaving")
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index f666e9be5a..4fd5aa1964 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,6 +1,7 @@
 import { scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import { deprecated } from "discourse/mixins/scroll-top";
+import Mixin from '@ember/object/mixin';
 
 const context = {
   _scrollTop() {
@@ -18,7 +19,7 @@ function scrollTop() {
   scheduleOnce("afterRender", context, context._scrollTop);
 }
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   didInsertElement() {
     deprecated(
       "The `ScrollTop` mixin is deprecated. Replace it with a `{{d-section}}` component"
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index f51474c0b2..f26d332d16 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -1,5 +1,6 @@
 import { scheduleOnce } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
+import Mixin from '@ember/object/mixin';
 
 /**
   This object provides the DOM methods we need for our Mixin to bind to scrolling
@@ -24,7 +25,7 @@ const ScrollingDOMMethods = {
   }
 };
 
-const Scrolling = Ember.Mixin.create({
+const Scrolling = Mixin.create({
   // Begin watching for scroll events. By default they will be called at max every 100ms.
   // call with {debounce: N} for a diff time
   bindScrolling(opts) {
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js.es6
index b67c529fdf..ad6625c7ad 100644
--- a/app/assets/javascripts/discourse/mixins/singleton.js.es6
+++ b/app/assets/javascripts/discourse/mixins/singleton.js.es6
@@ -45,7 +45,9 @@
 
   ```
 **/
-const Singleton = Ember.Mixin.create({
+import Mixin from '@ember/object/mixin';
+
+const Singleton = Mixin.create({
   current() {
     if (!this._current) {
       this._current = this.createCurrent();
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index d12a1ef00a..655b137425 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -2,9 +2,11 @@ import {
   displayErrorForUpload,
   validateUploadedFiles
 } from "discourse/lib/utilities";
-import getUrl from "discourse-common/lib/get-url";
 
-export default Ember.Mixin.create({
+import getUrl from "discourse-common/lib/get-url";
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({
   uploading: false,
   uploadProgress: 0,
 
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
index c5345d4ee9..73580d0e2c 100644
--- a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
@@ -4,8 +4,9 @@ import {
   on,
   default as computed
 } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   @on("init")
   _createUserFields() {
     if (!this.site) {
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
index 892f587b85..c445c60893 100644
--- a/app/assets/javascripts/discourse/mixins/username-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
@@ -2,8 +2,9 @@ import InputValidation from "discourse/models/input-validation";
 import debounce from "discourse/lib/debounce";
 import { setting } from "discourse/lib/computed";
 import { default as computed } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   uniqueUsernameValidation: null,
 
   maxUsernameLength: setting("max_username_length"),
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.es6
index d40b2398e7..07fcbee139 100644
--- 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.es6
@@ -1,7 +1,8 @@
 import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
 import { timeframeDetails } from "select-kit/components/future-date-input-selector";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   _computeIconsForValue(value) {
     let { icon } = this._updateAt(value);
 
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 62522d9edd..fa01f8f84c 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -1,8 +1,9 @@
 import { next } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index f985da1616..231814263a 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,10 +1,11 @@
 import { throttle } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
+import Mixin from '@ember/object/mixin';
 
 const { bind } = Ember.run;
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   @on("init")
   _initKeys() {
     this.keys = {
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
index fd8c9ae9f6..546c6df644 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -1,3 +1,5 @@
+import Mixin from '@ember/object/mixin';
+
 let _appendContentCallbacks = {};
 function appendContent(pluginApiIdentifiers, contentFunction) {
   if (Ember.isNone(_appendContentCallbacks[pluginApiIdentifiers])) {
@@ -167,7 +169,7 @@ export function clearCallbacks() {
 }
 
 const EMPTY_ARRAY = Object.freeze([]);
-export default Ember.Mixin.create({
+export default Mixin.create({
   concatenatedProperties: ["pluginApiIdentifiers"],
   pluginApiIdentifiers: EMPTY_ARRAY
 });
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
index 39644bfa5f..20a849a410 100644
--- a/app/assets/javascripts/select-kit/mixins/tags.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -1,8 +1,9 @@
 const { run, get } = Ember;
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   willDestroyElement() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js.es6
index 3bbf7e8d8e..1d5c88adcf 100644
--- a/app/assets/javascripts/select-kit/mixins/utils.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/utils.js.es6
@@ -1,6 +1,7 @@
+import Mixin from '@ember/object/mixin';
 const { get, isNone, guidFor } = Ember;
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   valueForContentItem(content) {
     switch (typeof content) {
       case "string":

From ced3807b230717a88228e602c1172ca044529d14 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 30 Oct 2019 15:13:48 -0500
Subject: [PATCH 243/328] FIX: Prettier on importing mixin (#8270)

---
 app/assets/javascripts/admin/mixins/penalty-controller.js.es6   | 2 +-
 app/assets/javascripts/admin/mixins/period-computation.js.es6   | 2 +-
 app/assets/javascripts/admin/mixins/setting-component.js.es6    | 2 +-
 app/assets/javascripts/admin/mixins/setting-object.js.es6       | 2 +-
 .../javascripts/discourse/mixins/bulk-topic-selection.js.es6    | 2 +-
 app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 | 2 +-
 .../javascripts/discourse/mixins/card-contents-base.js.es6      | 2 +-
 app/assets/javascripts/discourse/mixins/cleans-up.js.es6        | 2 +-
 app/assets/javascripts/discourse/mixins/docking.js.es6          | 2 +-
 .../javascripts/discourse/mixins/grant-badge-controller.js.es6  | 2 +-
 app/assets/javascripts/discourse/mixins/load-more.js.es6        | 2 +-
 .../javascripts/discourse/mixins/mobile-scroll-direction.js.es6 | 2 +-
 .../javascripts/discourse/mixins/modal-functionality.js.es6     | 2 +-
 app/assets/javascripts/discourse/mixins/name-validation.js.es6  | 2 +-
 app/assets/javascripts/discourse/mixins/open-composer.js.es6    | 2 +-
 app/assets/javascripts/discourse/mixins/pan-events.js.es6       | 2 +-
 .../javascripts/discourse/mixins/password-validation.js.es6     | 2 +-
 .../discourse/mixins/preferences-tab-controller.js.es6          | 2 +-
 app/assets/javascripts/discourse/mixins/scroll-top.js.es6       | 2 +-
 app/assets/javascripts/discourse/mixins/scrolling.js.es6        | 2 +-
 app/assets/javascripts/discourse/mixins/singleton.js.es6        | 2 +-
 app/assets/javascripts/discourse/mixins/upload.js.es6           | 2 +-
 .../javascripts/discourse/mixins/user-fields-validation.js.es6  | 2 +-
 .../javascripts/discourse/mixins/username-validation.js.es6     | 2 +-
 .../components/future-date-input-selector/mixin.js.es6          | 2 +-
 app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6     | 2 +-
 app/assets/javascripts/select-kit/mixins/events.js.es6          | 2 +-
 app/assets/javascripts/select-kit/mixins/plugin-api.js.es6      | 2 +-
 app/assets/javascripts/select-kit/mixins/tags.js.es6            | 2 +-
 app/assets/javascripts/select-kit/mixins/utils.js.es6           | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index e418887da2..7be1ab97b2 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,6 +1,6 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create(ModalFunctionality, {
   reason: null,
diff --git a/app/assets/javascripts/admin/mixins/period-computation.js.es6 b/app/assets/javascripts/admin/mixins/period-computation.js.es6
index 01d903f373..354fd0ad85 100644
--- a/app/assets/javascripts/admin/mixins/period-computation.js.es6
+++ b/app/assets/javascripts/admin/mixins/period-computation.js.es6
@@ -1,6 +1,6 @@
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   queryParams: ["period"],
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 28d3e1525d..09b3b4ce7b 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -1,6 +1,6 @@
 import computed from "ember-addons/ember-computed-decorators";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 const CUSTOM_TYPES = [
   "bool",
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js.es6
index ec91a5ad01..c02004cea8 100644
--- a/app/assets/javascripts/admin/mixins/setting-object.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-object.js.es6
@@ -1,5 +1,5 @@
 import computed from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   @computed("value", "default")
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
index b03bf1f86f..15acb53454 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -1,6 +1,6 @@
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { on } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   bulkSelectEnabled: false,
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index f3af56a3ec..db18fbdd3e 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -1,5 +1,5 @@
 import { propertyEqual, setting } from "discourse/lib/computed";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
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 dae6c1edc1..41adfa3b02 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -4,7 +4,7 @@ import { schedule } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   elementId: null, //click detection added for data-{elementId}
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
index 2d229620b3..3d85905eb5 100644
--- a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
+++ b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
@@ -1,4 +1,4 @@
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 // Include this mixin if you want to be notified when the dom should be
 // cleaned (usually on route change.)
 export default Mixin.create({
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js.es6
index 6bc0250d0c..3df9f80eda 100644
--- a/app/assets/javascripts/discourse/mixins/docking.js.es6
+++ b/app/assets/javascripts/discourse/mixins/docking.js.es6
@@ -1,4 +1,4 @@
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 import { debounce } from "@ember/runloop";
 
 const helper = {
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
index f13b88dc54..2ff5bdfe65 100644
--- a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UserBadge from "discourse/models/user-badge";
 import { convertIconClass } from "discourse-common/lib/icon-library";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   @computed("allBadges.[]", "userBadges.[]")
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6
index 9872914aec..a7761e1399 100644
--- a/app/assets/javascripts/discourse/mixins/load-more.js.es6
+++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6
@@ -1,7 +1,7 @@
 import Eyeline from "discourse/lib/eyeline";
 import Scrolling from "discourse/mixins/scrolling";
 import { on } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 // Provides the ability to load more items for a view which is scrolled to the bottom.
 export default Mixin.create(Scrolling, {
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
index 96534bcda8..b2eabe0815 100644
--- a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
+++ b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
@@ -1,5 +1,5 @@
 import { debounce } from "@ember/runloop";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 // Small buffer so that very tiny scrolls don't trigger mobile header switch
 const MOBILE_SCROLL_TOLERANCE = 5;
 
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
index 0f8e860234..70b5bd010c 100644
--- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
+++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
@@ -1,5 +1,5 @@
 import showModal from "discourse/lib/show-modal";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   flash(text, messageClass) {
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
index 45bf59750a..b1a07dc3ad 100644
--- a/app/assets/javascripts/discourse/mixins/name-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
@@ -1,6 +1,6 @@
 import InputValidation from "discourse/models/input-validation";
 import { default as computed } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   @computed()
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
index 4bd5100cf5..5896a09d5d 100644
--- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6
+++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
@@ -1,6 +1,6 @@
 // This mixin allows a route to open the composer
 import Composer from "discourse/models/composer";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   openComposer(controller) {
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js.es6 b/app/assets/javascripts/discourse/mixins/pan-events.js.es6
index 4fa81a7117..fb05901205 100644
--- a/app/assets/javascripts/discourse/mixins/pan-events.js.es6
+++ b/app/assets/javascripts/discourse/mixins/pan-events.js.es6
@@ -1,4 +1,4 @@
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 /**
    Pan events is a mixin that allows components to detect and respond to swipe gestures
    It fires callbacks for panStart, panEnd, panMove with the pan state, and the original event.
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
index fdd27bb640..4096ccc2a0 100644
--- a/app/assets/javascripts/discourse/mixins/password-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
@@ -1,6 +1,6 @@
 import InputValidation from "discourse/models/input-validation";
 import { default as computed } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   rejectedPasswords: null,
diff --git a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6 b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
index 0c602e83c5..7e49326f41 100644
--- a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
@@ -1,5 +1,5 @@
 import { default as computed } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   saved: false,
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index 4fd5aa1964..82ae1c0479 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,7 +1,7 @@
 import { scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import { deprecated } from "discourse/mixins/scroll-top";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 const context = {
   _scrollTop() {
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index f26d332d16..b690c77de4 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -1,6 +1,6 @@
 import { scheduleOnce } from "@ember/runloop";
 import debounce from "discourse/lib/debounce";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 /**
   This object provides the DOM methods we need for our Mixin to bind to scrolling
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js.es6
index ad6625c7ad..5c4ac8238d 100644
--- a/app/assets/javascripts/discourse/mixins/singleton.js.es6
+++ b/app/assets/javascripts/discourse/mixins/singleton.js.es6
@@ -45,7 +45,7 @@
 
   ```
 **/
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 const Singleton = Mixin.create({
   current() {
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 655b137425..47eb37b2b9 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -4,7 +4,7 @@ import {
 } from "discourse/lib/utilities";
 
 import getUrl from "discourse-common/lib/get-url";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   uploading: false,
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
index 73580d0e2c..3fd0d26c86 100644
--- a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
@@ -4,7 +4,7 @@ import {
   on,
   default as computed
 } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   @on("init")
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
index c445c60893..9aa8ea4b70 100644
--- a/app/assets/javascripts/discourse/mixins/username-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
@@ -2,7 +2,7 @@ import InputValidation from "discourse/models/input-validation";
 import debounce from "discourse/lib/debounce";
 import { setting } from "discourse/lib/computed";
 import { default as computed } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   uniqueUsernameValidation: null,
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.es6
index 07fcbee139..dd111348de 100644
--- 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.es6
@@ -1,6 +1,6 @@
 import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
 import { timeframeDetails } from "select-kit/components/future-date-input-selector";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   _computeIconsForValue(value) {
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index fa01f8f84c..98e79eba58 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -1,7 +1,7 @@
 import { next } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   init() {
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 231814263a..f37cade557 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,7 +1,7 @@
 import { throttle } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 const { bind } = Ember.run;
 
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
index 546c6df644..68dd1c8839 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -1,4 +1,4 @@
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 let _appendContentCallbacks = {};
 function appendContent(pluginApiIdentifiers, contentFunction) {
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
index 20a849a410..a9749fa49a 100644
--- a/app/assets/javascripts/select-kit/mixins/tags.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -1,7 +1,7 @@
 const { run, get } = Ember;
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   willDestroyElement() {
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js.es6
index 1d5c88adcf..5ee7b96c90 100644
--- a/app/assets/javascripts/select-kit/mixins/utils.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/utils.js.es6
@@ -1,4 +1,4 @@
-import Mixin from '@ember/object/mixin';
+import Mixin from "@ember/object/mixin";
 const { get, isNone, guidFor } = Ember;
 
 export default Mixin.create({

From 790a7e2095f85039c3352d4a8b450d392975bd9f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 30 Oct 2019 16:18:43 -0400
Subject: [PATCH 244/328] Ensure page is scrolled up on new query in full page
 search

---
 .../javascripts/discourse/controllers/full-page-search.js.es6   | 2 ++
 1 file changed, 2 insertions(+)

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 97b7ded953..7fdd47d57f 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -16,6 +16,7 @@ import { escapeExpression } from "discourse/lib/utilities";
 import { setTransient } from "discourse/lib/page-tracker";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Composer from "discourse/models/composer";
+import { scrollTop } from "discourse/mixins/scroll-top";
 
 const SortOrders = [
   { name: I18n.t("search.relevance"), id: 0 },
@@ -226,6 +227,7 @@ export default Controller.extend({
       this.set("bulkSelectEnabled", false);
       this.selected.clear();
       this.set("searching", true);
+      scrollTop();
     } else {
       this.set("loading", true);
     }

From 2ae21e9c35a43f2a3ff5a875d637e94323856276 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 30 Oct 2019 15:28:29 -0500
Subject: [PATCH 245/328] DEV: Import every instance of Ember.computed function
 (#8267)

* DEV: Import every instance of Ember.computed function

* export default for Ember.computed
---
 .../components/admin-report-counts.js.es6     |  3 +-
 .../admin-report-storage-stats.js.es6         |  5 +--
 .../components/admin-report-table-cell.js.es6 |  9 ++---
 .../components/admin-report-table.js.es6      |  3 +-
 .../admin/components/admin-report.js.es6      | 21 +++++------
 .../components/admin-user-field-item.js.es6   |  3 +-
 .../admin-web-hook-event-chooser.js.es6       |  3 +-
 .../components/email-styles-editor.js.es6     |  3 +-
 .../admin/components/embeddable-host.js.es6   |  3 +-
 .../components/penalty-post-action.js.es6     |  3 +-
 .../admin/components/save-controls.js.es6     |  3 +-
 .../admin/components/tags-uploader.js.es6     |  3 +-
 .../admin/components/theme-translation.js.es6 |  5 +--
 .../admin/components/themes-list-item.js.es6  |  7 ++--
 .../admin/components/themes-list.js.es6       | 11 +++---
 .../admin/components/value-list.js.es6        |  5 +--
 .../components/watched-word-uploader.js.es6   |  3 +-
 .../controllers/admin-backups-index.js.es6    |  5 +--
 .../controllers/admin-backups-logs.js.es6     |  3 +-
 .../admin/controllers/admin-backups.js.es6    |  7 ++--
 .../controllers/admin-badges-show.js.es6      | 11 +++---
 .../admin-customize-email-templates.js.es6    |  3 +-
 .../admin-customize-robots-txt.js.es6         |  3 +-
 .../admin-customize-themes-show.js.es6        |  9 ++---
 .../controllers/admin-email-index.js.es6      |  3 +-
 .../admin-email-preview-digest.js.es6         |  9 ++---
 .../admin/controllers/admin-emojis.js.es6     |  3 +-
 .../admin-logs-staff-action-logs.js.es6       |  3 +-
 .../controllers/admin-site-settings.js.es6    |  3 +-
 .../controllers/admin-user-badges.js.es6      |  9 ++---
 .../controllers/admin-user-fields.js.es6      |  5 +--
 .../admin/controllers/admin-user-index.js.es6 |  5 +--
 .../admin-watched-words-action.js.es6         |  3 +-
 .../controllers/admin-watched-words.js.es6    |  3 +-
 .../admin-web-hooks-show-events.js.es6        |  3 +-
 .../controllers/admin-web-hooks-show.js.es6   |  7 ++--
 .../modals/admin-add-upload.js.es6            |  5 +--
 .../modals/admin-badge-preview.js.es6         |  9 ++---
 .../modals/admin-install-theme.js.es6         | 15 ++++----
 .../admin/mixins/setting-component.js.es6     |  5 +--
 .../admin/models/admin-user.js.es6            | 17 ++++-----
 .../admin/models/backup-status.js.es6         |  3 +-
 .../admin/models/color-scheme.js.es6          |  3 +-
 .../admin/models/screened-ip-address.js.es6   |  3 +-
 .../javascripts/admin/models/theme.js.es6     |  7 ++--
 app/assets/javascripts/discourse-loader.js    | 35 +++++++++++++++++++
 .../discourse/components/badge-button.js.es6  |  3 +-
 .../components/basic-topic-list.js.es6        |  5 +--
 .../discourse/components/bread-crumbs.js.es6  |  7 ++--
 .../components/composer-action-title.js.es6   |  7 ++--
 .../components/composer-messages.js.es6       |  3 +-
 .../components/composer-title.js.es6          |  5 +--
 .../components/create-topics-notice.js.es6    |  3 +-
 .../discourse/components/d-button.js.es6      |  5 +--
 .../components/date-time-input-range.js.es6   |  5 +--
 .../desktop-notification-config.js.es6        |  3 +-
 .../components/discourse-topic.js.es6         |  7 ++--
 .../components/edit-category-general.js.es6   |  3 +-
 .../components/edit-category-panel.js.es6     |  3 +-
 .../components/edit-category-settings.js.es6  |  7 ++--
 .../components/edit-category-tags.js.es6      |  7 ++--
 .../components/edit-topic-timer-form.js.es6   | 17 ++++-----
 .../components/emoji-uploader.js.es6          |  5 +--
 .../components/flag-action-type.js.es6        |  7 ++--
 .../components/future-date-input.js.es6       |  9 ++---
 .../discourse/components/google-search.js.es6 |  3 +-
 .../components/group-card-contents.js.es6     |  9 ++---
 .../components/group-members-input.js.es6     |  3 +-
 .../groups-form-profile-fields.js.es6         |  3 +-
 .../discourse/components/input-tip.js.es6     |  5 +--
 .../discourse/components/invite-panel.js.es6  | 15 ++++----
 .../discourse/components/modal-tab.js.es6     |  5 +--
 .../components/popup-input-tip.js.es6         |  5 +--
 .../reviewable-bundled-action.js.es6          |  5 +--
 .../reviewable-conversation-post.js.es6       |  3 +-
 .../components/reviewable-flagged-post.js.es6 |  3 +-
 .../components/reviewable-histories.js.es6    |  3 +-
 .../discourse/components/share-panel.js.es6   |  5 +--
 .../discourse/components/tag-list.js.es6      |  3 +-
 .../discourse/components/time-input.js.es6    | 11 +++---
 .../components/topic-footer-buttons.js.es6    |  9 ++---
 .../components/topic-list-item.js.es6         |  3 +-
 .../discourse/components/topic-list.js.es6    |  5 +--
 .../components/topic-progress.js.es6          |  3 +-
 .../components/user-card-contents.js.es6      | 21 +++++------
 .../discourse/components/user-info.js.es6     |  5 +--
 .../discourse/components/user-link.js.es6     |  5 +--
 .../discourse/components/user-stat.js.es6     |  5 +--
 .../discourse/controllers/about.js.es6        |  3 +-
 .../bulk-notification-level.js.es6            |  3 +-
 .../discourse/controllers/change-owner.js.es6 |  5 +--
 .../discourse/controllers/composer.js.es6     | 17 ++++-----
 .../controllers/create-account.js.es6         |  7 ++--
 .../controllers/discovery-sortable.js.es6     |  5 +--
 .../discourse/controllers/discovery.js.es6    |  7 ++--
 .../controllers/discovery/categories.js.es6   |  3 +-
 .../controllers/discovery/topics.js.es6       | 23 ++++++------
 .../discourse/controllers/exception.js.es6    | 11 +++---
 .../discourse/controllers/flag.js.es6         |  3 +-
 .../controllers/full-page-search.js.es6       |  3 +-
 .../discourse/controllers/group-index.js.es6  |  3 +-
 .../discourse/controllers/history.js.es6      | 31 ++++++++--------
 .../discourse/controllers/invites-show.js.es6 |  9 ++---
 .../discourse/controllers/jump-to-post.js.es6 |  3 +-
 .../discourse/controllers/login.js.es6        |  7 ++--
 .../controllers/move-to-topic.js.es6          | 19 +++++-----
 .../controllers/navigation/category.js.es6    |  5 +--
 .../controllers/password-reset.js.es6         | 13 +++----
 .../controllers/preferences/account.js.es6    |  9 ++---
 .../controllers/preferences/categories.js.es6 |  3 +-
 .../controllers/preferences/email.js.es6      |  5 +--
 .../controllers/preferences/emails.js.es6     |  5 +--
 .../preferences/second-factor.js.es6          |  5 +--
 .../controllers/preferences/username.js.es6   |  5 +--
 .../controllers/preferences/users.js.es6      |  7 ++--
 .../discourse/controllers/raw-email.js.es6    |  7 ++--
 .../controllers/reorder-categories.js.es6     |  3 +-
 .../request-group-membership-form.js.es6      |  3 +-
 .../second-factor-backup-edit.js.es6          |  5 +--
 .../discourse/controllers/static.js.es6       |  3 +-
 .../discourse/controllers/tags-index.js.es6   |  7 ++--
 .../discourse/controllers/tags-show.js.es6    |  5 +--
 .../controllers/topic-bulk-actions.js.es6     |  5 +--
 .../discourse/controllers/topic.js.es6        | 17 ++++-----
 .../controllers/upload-selector.js.es6        |  5 +--
 .../controllers/user-activity.js.es6          |  3 +-
 .../discourse/controllers/user-badges.js.es6  |  5 +--
 .../controllers/user-invited-show.js.es6      |  9 ++---
 .../controllers/user-private-messages.js.es6  | 15 ++++----
 .../discourse/controllers/user-summary.js.es6 |  3 +-
 .../discourse/controllers/user.js.es6         | 21 +++++------
 .../discourse/controllers/users.js.es6        |  3 +-
 .../mixins/bulk-topic-selection.js.es6        |  3 +-
 .../discourse/mixins/can-check-emails.js.es6  |  7 ++--
 .../mixins/card-contents-base.js.es6          |  5 +--
 .../mixins/grant-badge-controller.js.es6      |  3 +-
 .../discourse/models/action-summary.js.es6    |  3 +-
 .../discourse/models/archetype.js.es6         |  5 +--
 .../javascripts/discourse/models/badge.js.es6 |  3 +-
 .../discourse/models/composer.js.es6          | 33 ++++++++---------
 .../javascripts/discourse/models/group.js.es6 |  5 +--
 .../discourse/models/post-action-type.js.es6  |  3 +-
 .../discourse/models/post-stream.js.es6       | 13 +++----
 .../javascripts/discourse/models/post.js.es6  | 11 +++---
 .../javascripts/discourse/models/rest.js.es6  |  5 +--
 .../models/reviewable-history.js.es6          |  3 +-
 .../javascripts/discourse/models/site.js.es6  |  5 +--
 .../discourse/models/topic-list.js.es6        |  3 +-
 .../javascripts/discourse/models/topic.js.es6 | 17 ++++-----
 .../discourse/models/user-action.js.es6       | 27 +++++++-------
 .../javascripts/discourse/models/user.js.es6  | 15 ++++----
 .../list/post-count-or-badges.js.es6          |  5 +--
 .../components/reviewable-score.js.es6        |  3 +-
 153 files changed, 621 insertions(+), 434 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
index fc0127ec88..625dd669ee 100644
--- a/app/assets/javascripts/admin/components/admin-report-counts.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
@@ -1,8 +1,9 @@
+import { match } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
   allTime: true,
   tagName: "tr",
-  reverseColors: Ember.computed.match(
+  reverseColors: match(
     "report.type",
     /^(time_to_first_response|topics_with_no_response)$/
   ),
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.es6
index 51142a6d19..948ecf1e87 100644
--- a/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -6,8 +7,8 @@ export default Component.extend({
   classNames: ["admin-report-storage-stats"],
 
   backupLocation: setting("backup_location"),
-  backupStats: Ember.computed.alias("model.data.backups"),
-  uploadStats: Ember.computed.alias("model.data.uploads"),
+  backupStats: alias("model.data.backups"),
+  uploadStats: alias("model.data.uploads"),
 
   @computed("backupStats")
   showBackupStats(stats) {
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.es6
index c2354de73a..f83a33dbfb 100644
--- a/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -12,8 +13,8 @@ export default Component.extend({
     return label.compute(data, options || {});
   },
 
-  type: Ember.computed.alias("label.type"),
-  property: Ember.computed.alias("label.mainProperty"),
-  formatedValue: Ember.computed.alias("computedLabel.formatedValue"),
-  value: Ember.computed.alias("computedLabel.value")
+  type: alias("label.type"),
+  property: alias("label.mainProperty"),
+  formatedValue: alias("computedLabel.formatedValue"),
+  value: alias("computedLabel.value")
 });
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js.es6
index 8df3a96f38..c82896d577 100644
--- a/app/assets/javascripts/admin/components/admin-report-table.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -8,7 +9,7 @@ export default Component.extend({
   classNames: ["admin-report-table"],
   sortable: false,
   sortDirection: 1,
-  perPage: Ember.computed.alias("options.perPage"),
+  perPage: alias("options.perPage"),
   page: 0,
 
   @computed("model.computedLabels.length")
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 5b3fbdd9a5..025b9496f2 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,3 +1,4 @@
+import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
@@ -57,12 +58,12 @@ export default Component.extend({
   showHeader: true,
   showTitle: true,
   showFilteringUI: false,
-  showDatesOptions: Ember.computed.alias("model.dates_filtering"),
-  showRefresh: Ember.computed.or(
+  showDatesOptions: alias("model.dates_filtering"),
+  showRefresh: or(
     "showDatesOptions",
     "model.available_filters.length"
   ),
-  shouldDisplayTrend: Ember.computed.and("showTrend", "model.prev_period"),
+  shouldDisplayTrend: and("showTrend", "model.prev_period"),
 
   init() {
     this._super(...arguments);
@@ -70,8 +71,8 @@ export default Component.extend({
     this._reports = [];
   },
 
-  startDate: Ember.computed.reads("filters.startDate"),
-  endDate: Ember.computed.reads("filters.endDate"),
+  startDate: reads("filters.startDate"),
+  endDate: reads("filters.endDate"),
 
   didReceiveAttrs() {
     this._super(...arguments);
@@ -83,16 +84,16 @@ export default Component.extend({
     }
   },
 
-  showError: Ember.computed.or(
+  showError: or(
     "showTimeoutError",
     "showExceptionError",
     "showNotFoundError"
   ),
-  showNotFoundError: Ember.computed.equal("model.error", "not_found"),
-  showTimeoutError: Ember.computed.equal("model.error", "timeout"),
-  showExceptionError: Ember.computed.equal("model.error", "exception"),
+  showNotFoundError: equal("model.error", "not_found"),
+  showTimeoutError: equal("model.error", "timeout"),
+  showExceptionError: equal("model.error", "exception"),
 
-  hasData: Ember.computed.notEmpty("model.data"),
+  hasData: notEmpty("model.data"),
 
   @computed("dataSourceName", "model.type")
   dasherizedDataSourceName(dataSourceName, type) {
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.es6
index f186b291f1..4c6392635d 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,3 +1,4 @@
+import { empty } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import UserField from "admin/models/user-field";
@@ -12,7 +13,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Component.extend(bufferedProperty("userField"), {
-  editing: Ember.computed.empty("userField.id"),
+  editing: empty("userField.id"),
   classNameBindings: [":user-field"],
 
   cantMoveUp: propertyEqual("userField", "firstField"),
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.es6
index 32ca7e4fad..1c7f6f05a0 100644
--- 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.es6
@@ -1,9 +1,10 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Component.extend({
   classNames: ["hook-event"],
-  typeName: Ember.computed.alias("type.name"),
+  typeName: alias("type.name"),
 
   @computed("typeName")
   name(typeName) {
diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js.es6 b/app/assets/javascripts/admin/components/email-styles-editor.js.es6
index c0b6c732e9..e465c04cba 100644
--- a/app/assets/javascripts/admin/components/email-styles-editor.js.es6
+++ b/app/assets/javascripts/admin/components/email-styles-editor.js.es6
@@ -1,8 +1,9 @@
+import { reads } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Component.extend({
-  editorId: Ember.computed.reads("fieldName"),
+  editorId: reads("fieldName"),
 
   @computed("fieldName")
   currentEditorMode(fieldName) {
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index debb6b25b1..98e1eab93a 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,3 +1,4 @@
+import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -10,7 +11,7 @@ export default Component.extend(bufferedProperty("host"), {
   tagName: "tr",
   categoryId: null,
 
-  editing: Ember.computed.or("host.isNew", "editToggled"),
+  editing: or("host.isNew", "editToggled"),
 
   @on("didInsertElement")
   @observes("editing")
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index 7fefa0f3e5..8af1f83b16 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
@@ -16,7 +17,7 @@ export default Component.extend({
     });
   },
 
-  editing: Ember.computed.equal("postAction", "edit"),
+  editing: equal("postAction", "edit"),
 
   actions: {
     penaltyChanged() {
diff --git a/app/assets/javascripts/admin/components/save-controls.js.es6 b/app/assets/javascripts/admin/components/save-controls.js.es6
index cc858b1530..b039b0158c 100644
--- a/app/assets/javascripts/admin/components/save-controls.js.es6
+++ b/app/assets/javascripts/admin/components/save-controls.js.es6
@@ -1,10 +1,11 @@
+import { or } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Component.extend({
   classNames: ["controls"],
 
-  buttonDisabled: Ember.computed.or("model.isSaving", "saveDisabled"),
+  buttonDisabled: or("model.isSaving", "saveDisabled"),
 
   @computed("model.isSaving")
   savingText(saving) {
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js.es6
index 1682fd955e..88f4afc8d9 100644
--- a/app/assets/javascripts/admin/components/tags-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/tags-uploader.js.es6
@@ -1,10 +1,11 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
 
 export default Component.extend(UploadMixin, {
   type: "csv",
   uploadUrl: "/tags/upload",
-  addDisabled: Ember.computed.alias("uploading"),
+  addDisabled: alias("uploading"),
   elementId: "tag-uploader",
 
   validateUploadedFilesOptions() {
diff --git a/app/assets/javascripts/admin/components/theme-translation.js.es6 b/app/assets/javascripts/admin/components/theme-translation.js.es6
index dcdc4a5fd2..361df489af 100644
--- a/app/assets/javascripts/admin/components/theme-translation.js.es6
+++ b/app/assets/javascripts/admin/components/theme-translation.js.es6
@@ -1,12 +1,13 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SettingComponent from "admin/mixins/setting-component";
 
 export default Component.extend(BufferedContent, SettingComponent, {
   layoutName: "admin/templates/components/site-setting",
-  setting: Ember.computed.alias("translation"),
+  setting: alias("translation"),
   type: "string",
-  settingName: Ember.computed.alias("translation.key"),
+  settingName: alias("translation.key"),
 
   _save() {
     return this.model.saveTranslation(
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 6d68f4d8e3..af30e5a398 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -1,3 +1,4 @@
+import { gt, and } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
@@ -13,9 +14,9 @@ export default Component.extend({
   childrenExpanded: false,
   classNames: ["themes-list-item"],
   classNameBindings: ["theme.selected:selected"],
-  hasComponents: Ember.computed.gt("children.length", 0),
-  displayComponents: Ember.computed.and("hasComponents", "theme.isActive"),
-  displayHasMore: Ember.computed.gt("theme.childThemes.length", MAX_COMPONENTS),
+  hasComponents: gt("children.length", 0),
+  displayComponents: and("hasComponents", "theme.isActive"),
+  displayHasMore: gt("theme.childThemes.length", MAX_COMPONENTS),
 
   click(e) {
     if (!$(e.target).hasClass("others-count")) {
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js.es6
index ec66ce5c4f..357e4f756c 100644
--- a/app/assets/javascripts/admin/components/themes-list.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list.js.es6
@@ -1,3 +1,4 @@
+import { gt, equal } from "@ember/object/computed";
 import Component from "@ember/component";
 import { THEMES, COMPONENTS } from "admin/models/theme";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -8,12 +9,12 @@ export default Component.extend({
 
   classNames: ["themes-list"],
 
-  hasThemes: Ember.computed.gt("themesList.length", 0),
-  hasActiveThemes: Ember.computed.gt("activeThemes.length", 0),
-  hasInactiveThemes: Ember.computed.gt("inactiveThemes.length", 0),
+  hasThemes: gt("themesList.length", 0),
+  hasActiveThemes: gt("activeThemes.length", 0),
+  hasInactiveThemes: gt("inactiveThemes.length", 0),
 
-  themesTabActive: Ember.computed.equal("currentTab", THEMES),
-  componentsTabActive: Ember.computed.equal("currentTab", COMPONENTS),
+  themesTabActive: equal("currentTab", THEMES),
+  componentsTabActive: equal("currentTab", COMPONENTS),
 
   @computed("themes", "components", "currentTab")
   themesList(themes, components) {
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6
index 8a1fa5baa1..aa21a2f48b 100644
--- a/app/assets/javascripts/admin/components/value-list.js.es6
+++ b/app/assets/javascripts/admin/components/value-list.js.es6
@@ -1,3 +1,4 @@
+import { empty, alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
@@ -5,14 +6,14 @@ import computed from "ember-addons/ember-computed-decorators";
 export default Component.extend({
   classNameBindings: [":value-list"],
 
-  inputInvalid: Ember.computed.empty("newValue"),
+  inputInvalid: empty("newValue"),
 
   inputDelimiter: null,
   inputType: null,
   newValue: "",
   collection: null,
   values: null,
-  noneKey: Ember.computed.alias("addKey"),
+  noneKey: alias("addKey"),
 
   @on("didReceiveAttrs")
   _setupCollection() {
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
index b38d8c2606..417f3d5bbf 100644
--- a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
@@ -6,7 +7,7 @@ export default Component.extend(UploadMixin, {
   type: "txt",
   classNames: "watched-words-uploader",
   uploadUrl: "/admin/logs/watched_words/upload",
-  addDisabled: Ember.computed.alias("uploading"),
+  addDisabled: alias("uploading"),
 
   validateUploadedFilesOptions() {
     return { skipValidation: true };
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 6c7249c3f9..6b69eaea72 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,3 +1,4 @@
+import { alias, equal } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -6,10 +7,10 @@ import { setting, i18n } from "discourse/lib/computed";
 
 export default Controller.extend({
   adminBackups: inject(),
-  status: Ember.computed.alias("adminBackups.model"),
+  status: alias("adminBackups.model"),
   uploadLabel: i18n("admin.backups.upload.label"),
   backupLocation: setting("backup_location"),
-  localBackupStorage: Ember.computed.equal("backupLocation", "local"),
+  localBackupStorage: equal("backupLocation", "local"),
 
   @computed("status.allowRestore", "status.isOperationRunning")
   restoreTitle(allowRestore, isOperationRunning) {
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 156d6f2f2a..a32e216255 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,9 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 export default Controller.extend({
   adminBackups: inject(),
-  status: Ember.computed.alias("adminBackups.model"),
+  status: alias("adminBackups.model"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js.es6
index d697ae7288..7e942d9e9c 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups.js.es6
@@ -1,10 +1,11 @@
+import { not, and } from "@ember/object/computed";
 import Controller from "@ember/controller";
 export default Controller.extend({
-  noOperationIsRunning: Ember.computed.not("model.isOperationRunning"),
-  rollbackEnabled: Ember.computed.and(
+  noOperationIsRunning: not("model.isOperationRunning"),
+  rollbackEnabled: and(
     "model.canRollback",
     "model.restoreEnabled",
     "noOperationIsRunning"
   ),
-  rollbackDisabled: Ember.computed.not("rollbackEnabled")
+  rollbackDisabled: not("rollbackEnabled")
 });
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 e432a9fbca..ddef8ce8a0 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -10,14 +11,14 @@ export default Controller.extend(bufferedProperty("model"), {
   saving: false,
   savingStatus: "",
 
-  badgeTypes: Ember.computed.alias("adminBadges.badgeTypes"),
-  badgeGroupings: Ember.computed.alias("adminBadges.badgeGroupings"),
-  badgeTriggers: Ember.computed.alias("adminBadges.badgeTriggers"),
-  protectedSystemFields: Ember.computed.alias(
+  badgeTypes: alias("adminBadges.badgeTypes"),
+  badgeGroupings: alias("adminBadges.badgeGroupings"),
+  badgeTriggers: alias("adminBadges.badgeTriggers"),
+  protectedSystemFields: alias(
     "adminBadges.protectedSystemFields"
   ),
 
-  readOnly: Ember.computed.alias("buffered.system"),
+  readOnly: alias("buffered.system"),
   showDisplayName: propertyNotEqual("name", "displayName"),
 
   @computed("model.query", "buffered.query")
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.es6
index 253641fc12..2f85e8418d 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
@@ -1,7 +1,8 @@
+import { sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
 export default Controller.extend({
   emailTemplates: null,
-  sortedTemplates: Ember.computed.sort("emailTemplates", "titleSorting"),
+  sortedTemplates: sort("emailTemplates", "titleSorting"),
 
   init() {
     this._super(...arguments);
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.es6
index 61b0b6269b..5c6d2499f4 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -7,7 +8,7 @@ export default Controller.extend(bufferedProperty("model"), {
   saved: false,
   isSaving: false,
   saveDisabled: propertyEqual("model.robots_txt", "buffered.robots_txt"),
-  resetDisbaled: Ember.computed.not("model.overridden"),
+  resetDisbaled: not("model.overridden"),
 
   actions: {
     save() {
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.es6
index 6b9c26601f..bb12b4e12b 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -1,3 +1,4 @@
+import { empty, notEmpty, match } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { url } from "discourse/lib/computed";
@@ -11,7 +12,7 @@ const THEME_UPLOAD_VAR = 2;
 export default Controller.extend({
   downloadUrl: url("model.id", "/admin/customize/themes/%@/export"),
   previewUrl: url("model.id", "/admin/themes/%@/preview"),
-  addButtonDisabled: Ember.computed.empty("selectedChildThemeId"),
+  addButtonDisabled: empty("selectedChildThemeId"),
   editRouteName: "adminCustomizeThemes.edit",
 
   @computed("model.editedFields")
@@ -80,14 +81,14 @@ export default Controller.extend({
     return settings.map(setting => ThemeSettings.create(setting));
   },
 
-  hasSettings: Ember.computed.notEmpty("settings"),
+  hasSettings: notEmpty("settings"),
 
   @computed("model.translations")
   translations(translations) {
     return translations.map(setting => ThemeSettings.create(setting));
   },
 
-  hasTranslations: Ember.computed.notEmpty("translations"),
+  hasTranslations: notEmpty("translations"),
 
   @computed("model.remoteError", "updatingRemote")
   showRemoteError(errorMessage, updating) {
@@ -148,7 +149,7 @@ export default Controller.extend({
       "scss"
     );
   },
-  sourceIsHttp: Ember.computed.match(
+  sourceIsHttp: match(
     "model.remote_theme.remote_url",
     /^http(s)?:\/\//
   ),
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
index 586c911c3c..124c364af3 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
@@ -1,3 +1,4 @@
+import { empty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 export default Controller.extend({
@@ -6,7 +7,7 @@ export default Controller.extend({
 
     @property sendTestEmailDisabled
   **/
-  sendTestEmailDisabled: Ember.computed.empty("testEmailAddress"),
+  sendTestEmailDisabled: empty("testEmailAddress"),
 
   /**
     Clears the 'sentTestEmail' property on successful send.
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.es6
index 648891b545..66b393196a 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
@@ -1,3 +1,4 @@
+import { empty, or, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -6,10 +7,10 @@ export default Controller.extend({
   username: null,
   lastSeen: null,
 
-  emailEmpty: Ember.computed.empty("email"),
-  sendEmailDisabled: Ember.computed.or("emailEmpty", "sendingEmail"),
-  showSendEmailForm: Ember.computed.notEmpty("model.html_content"),
-  htmlEmpty: Ember.computed.empty("model.html_content"),
+  emailEmpty: empty("email"),
+  sendEmailDisabled: or("emailEmpty", "sendingEmail"),
+  showSendEmailForm: notEmpty("model.html_content"),
+  htmlEmpty: empty("model.html_content"),
 
   actions: {
     refresh() {
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
index f9611b2813..6a1d295759 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
@@ -1,8 +1,9 @@
+import { sort } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 export default Controller.extend({
-  sortedEmojis: Ember.computed.sort("model", "emojiSorting"),
+  sortedEmojis: sort("model", "emojiSorting"),
 
   init() {
     this._super(...arguments);
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.es6
index 65df52b7f6..a375379fc0 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import { gt } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
@@ -11,7 +12,7 @@ import {
 export default Controller.extend({
   model: null,
   filters: null,
-  filtersExists: Ember.computed.gt("filterCount", 0),
+  filtersExists: gt("filterCount", 0),
   userHistoryActions: null,
 
   @computed("filters.action_name")
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 c2ae8d5a56..100ff83295 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,9 +1,10 @@
+import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
 export default Controller.extend({
   filter: null,
-  allSiteSettings: Ember.computed.alias("model"),
+  allSiteSettings: alias("model"),
   visibleSiteSettings: null,
   onlyOverridden: false,
 
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 eed2c23ec4..fac3436c6e 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,3 +1,4 @@
+import { alias, sort } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -7,10 +8,10 @@ import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend(GrantBadgeController, {
   adminUser: inject(),
-  user: Ember.computed.alias("adminUser.model"),
-  userBadges: Ember.computed.alias("model"),
-  allBadges: Ember.computed.alias("badges"),
-  sortedBadges: Ember.computed.sort("model", "badgeSortOrder"),
+  user: alias("adminUser.model"),
+  userBadges: alias("model"),
+  allBadges: alias("badges"),
+  sortedBadges: sort("model", "badgeSortOrder"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
index c2c6e9d5fc..b81b08f559 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
@@ -1,3 +1,4 @@
+import { gte, sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
@@ -5,8 +6,8 @@ const MAX_FIELDS = 20;
 
 export default Controller.extend({
   fieldTypes: null,
-  createDisabled: Ember.computed.gte("model.length", MAX_FIELDS),
-  sortedFields: Ember.computed.sort("model", "fieldSortOrder"),
+  createDisabled: gte("model.length", MAX_FIELDS),
+  sortedFields: sort("model", "fieldSortOrder"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 8db8b482a9..18f5509db7 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -1,3 +1,4 @@
+import { notEmpty, and } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -16,7 +17,7 @@ export default Controller.extend(CanCheckEmails, {
   userTitleValue: null,
 
   showBadges: setting("enable_badges"),
-  hasLockedTrustLevel: Ember.computed.notEmpty(
+  hasLockedTrustLevel: notEmpty(
     "model.manual_locked_trust_level"
   ),
 
@@ -25,7 +26,7 @@ export default Controller.extend(CanCheckEmails, {
     "model.primary_group_id"
   ),
 
-  canDisableSecondFactor: Ember.computed.and(
+  canDisableSecondFactor: and(
     "model.second_factor_enabled",
     "model.can_disable_second_factor"
   ),
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 4435eb9b25..1726446d8c 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,3 +1,4 @@
+import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -10,7 +11,7 @@ import showModal from "discourse/lib/show-modal";
 export default Controller.extend({
   actionNameKey: null,
   adminWatchedWords: inject(),
-  showWordsList: Ember.computed.or(
+  showWordsList: or(
     "adminWatchedWords.filtered",
     "adminWatchedWords.showWords"
   ),
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 5d52d67a36..db269043ee 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
@@ -6,7 +7,7 @@ export default Controller.extend({
   filter: null,
   filtered: false,
   showWords: false,
-  disableShowWords: Ember.computed.alias("filtered"),
+  disableShowWords: alias("filtered"),
   regularExpressions: null,
 
   filterContentNow() {
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.es6
index 1f10fa3e08..e550a79069 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -5,7 +6,7 @@ import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
   pingDisabled: false,
-  incomingCount: Ember.computed.alias("incomingEventIds.length"),
+  incomingCount: alias("incomingEventIds.length"),
 
   init() {
     this._super(...arguments);
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 6439e3b945..0a331bf8cf 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,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -7,9 +8,9 @@ import InputValidation from "discourse/models/input-validation";
 
 export default Controller.extend({
   adminWebHooks: inject(),
-  eventTypes: Ember.computed.alias("adminWebHooks.eventTypes"),
-  defaultEventTypes: Ember.computed.alias("adminWebHooks.defaultEventTypes"),
-  contentTypes: Ember.computed.alias("adminWebHooks.contentTypes"),
+  eventTypes: alias("adminWebHooks.eventTypes"),
+  defaultEventTypes: alias("adminWebHooks.defaultEventTypes"),
+  contentTypes: alias("adminWebHooks.contentTypes"),
 
   @computed
   showTagsFilter() {
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 aa77b2050e..3d0abf5037 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,3 +1,4 @@
+import { and, not } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -64,8 +65,8 @@ export default Controller.extend(ModalFunctionality, {
     this.set("fileSelected", false);
   },
 
-  enabled: Ember.computed.and("nameValid", "fileSelected"),
-  disabled: Ember.computed.not("enabled"),
+  enabled: and("nameValid", "fileSelected"),
+  disabled: not("enabled"),
 
   @computed("name", "adminCustomizeThemesShow.model.theme_fields")
   errorMessage(name, themeFields) {
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.es6
index bf58496ed7..b6419c8e04 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
@@ -1,11 +1,12 @@
+import { alias, map } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 
 export default Controller.extend({
-  sample: Ember.computed.alias("model.sample"),
-  errors: Ember.computed.alias("model.errors"),
-  count: Ember.computed.alias("model.grant_count"),
+  sample: alias("model.sample"),
+  errors: alias("model.errors"),
+  count: alias("model.grant_count"),
 
   @computed("count", "sample.length")
   countWarning(count, sampleLength) {
@@ -34,7 +35,7 @@ export default Controller.extend({
     return output;
   },
 
-  processedSample: Ember.computed.map("model.sample", grant => {
+  processedSample: map("model.sample", grant => {
     let i18nKey = "admin.badges.preview.grant.with";
     const i18nParams = { username: escapeExpression(grant.username) };
 
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 58137f6672..949353de7d 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,3 +1,4 @@
+import { equal, match, alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -13,24 +14,24 @@ import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 const MIN_NAME_LENGTH = 4;
 
 export default Controller.extend(ModalFunctionality, {
-  popular: Ember.computed.equal("selection", "popular"),
-  local: Ember.computed.equal("selection", "local"),
-  remote: Ember.computed.equal("selection", "remote"),
-  create: Ember.computed.equal("selection", "create"),
+  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",
   recordType: "theme",
-  checkPrivate: Ember.computed.match("uploadUrl", /^git/),
+  checkPrivate: match("uploadUrl", /^git/),
   localFile: null,
   uploadUrl: null,
   urlPlaceholder: "https://github.com/discourse/sample_theme",
   advancedVisible: false,
   themesController: inject("adminCustomizeThemes"),
-  selectedType: Ember.computed.alias("themesController.currentTab"),
-  component: Ember.computed.equal("selectedType", COMPONENTS),
+  selectedType: alias("themesController.currentTab"),
+  component: equal("selectedType", COMPONENTS),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 09b3b4ce7b..e90a10d37c 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 { alias, oneWay } from "@ember/object/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import Mixin from "@ember/object/mixin";
@@ -22,9 +23,9 @@ const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
 
 export default Mixin.create({
   classNameBindings: [":row", ":setting", "overridden", "typeClass"],
-  content: Ember.computed.alias("setting"),
+  content: alias("setting"),
   validationMessage: null,
-  isSecret: Ember.computed.oneWay("setting.secret"),
+  isSecret: oneWay("setting.secret"),
 
   @computed("buffered.value", "setting.value")
   dirty(bufferVal, settingVal) {
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index 8a8ba62481..a33bac5e03 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -1,3 +1,4 @@
+import { filter, or, gt, lt, not } from "@ember/object/computed";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
@@ -11,16 +12,16 @@ const wrapAdmin = user => (user ? AdminUser.create(user) : null);
 
 const AdminUser = Discourse.User.extend({
   adminUserView: true,
-  customGroups: Ember.computed.filter(
+  customGroups: filter(
     "groups",
     g => !g.automatic && Group.create(g)
   ),
-  automaticGroups: Ember.computed.filter(
+  automaticGroups: filter(
     "groups",
     g => g.automatic && Group.create(g)
   ),
 
-  canViewProfile: Ember.computed.or("active", "staged"),
+  canViewProfile: or("active", "staged"),
 
   @computed("bounce_score", "reset_bounce_score_after")
   bounceScore(bounce_score, reset_bounce_score_after) {
@@ -49,7 +50,7 @@ const AdminUser = Discourse.User.extend({
     return Discourse.getURL("/admin/email/bounced");
   },
 
-  canResetBounceScore: Ember.computed.gt("bounce_score", 0),
+  canResetBounceScore: gt("bounce_score", 0),
 
   resetBounceScore() {
     return ajax(`/admin/users/${this.id}/reset_bounce_score`, {
@@ -289,9 +290,9 @@ const AdminUser = Discourse.User.extend({
       });
   },
 
-  canLockTrustLevel: Ember.computed.lt("trust_level", 4),
+  canLockTrustLevel: lt("trust_level", 4),
 
-  canSuspend: Ember.computed.not("staff"),
+  canSuspend: not("staff"),
 
   @computed("suspended_till", "suspended_at")
   suspendDuration(suspendedTill, suspendedAt) {
@@ -557,9 +558,9 @@ AdminUser.reopenClass({
     });
   },
 
-  findAll(query, filter) {
+  findAll(query, userFilter) {
     return ajax(`/admin/users/list/${query}.json`, {
-      data: filter
+      data: userFilter
     }).then(users => users.map(u => AdminUser.create(u)));
   }
 });
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js.es6
index 2eb856c3be..b7deec1c10 100644
--- a/app/assets/javascripts/admin/models/backup-status.js.es6
+++ b/app/assets/javascripts/admin/models/backup-status.js.es6
@@ -1,7 +1,8 @@
+import { not } from "@ember/object/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Discourse.Model.extend({
-  restoreDisabled: Ember.computed.not("restoreEnabled"),
+  restoreDisabled: not("restoreEnabled"),
 
   @computed("allowRestore", "isOperationRunning")
   restoreEnabled(allowRestore, isOperationRunning) {
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index 26c8ccdc0e..8875bf2e5e 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import ColorSchemeColor from "admin/models/color-scheme-color";
 import computed from "ember-addons/ember-computed-decorators";
@@ -59,7 +60,7 @@ const ColorScheme = Discourse.Model.extend(Ember.Copyable, {
     return !changed || this.saving || this.colors.any(c => !c.get("valid"));
   },
 
-  newRecord: Ember.computed.not("id"),
+  newRecord: not("id"),
 
   save(opts) {
     if (this.is_base || this.disableSave) return;
diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js.es6 b/app/assets/javascripts/admin/models/screened-ip-address.js.es6
index c7f3863738..0449a666f3 100644
--- a/app/assets/javascripts/admin/models/screened-ip-address.js.es6
+++ b/app/assets/javascripts/admin/models/screened-ip-address.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -7,7 +8,7 @@ const ScreenedIpAddress = Discourse.Model.extend({
     return I18n.t(`admin.logs.screened_ips.actions.${actionName}`);
   },
 
-  isBlocked: Ember.computed.equal("action_name", "block"),
+  isBlocked: equal("action_name", "block"),
 
   @computed("ip_address")
   isRange(ipAddress) {
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index 7e49ff9b9e..b0c5f4729e 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -1,3 +1,4 @@
+import { or, gt } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -13,9 +14,9 @@ export const COMPONENTS = "components";
 const SETTINGS_TYPE_ID = 5;
 
 const Theme = RestModel.extend({
-  isActive: Ember.computed.or("default", "user_selectable"),
-  isPendingUpdates: Ember.computed.gt("remote_theme.commits_behind", 0),
-  hasEditedFields: Ember.computed.gt("editedFields.length", 0),
+  isActive: or("default", "user_selectable"),
+  isPendingUpdates: gt("remote_theme.commits_behind", 0),
+  hasEditedFields: gt("editedFields.length", 0),
 
   @computed("theme_fields.[]")
   targets() {
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index cb83e8aa4e..0cda325c30 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -12,6 +12,41 @@ var define, requirejs;
         inject: Ember.inject.controller
       },
       "@ember/object": { default: Ember.Object },
+      "@ember/object/computed": {
+        default: Ember.computed,
+        alias: Ember.computed.alias,
+        and: Ember.computed.and,
+        bool: Ember.computed.bool,
+        collect: Ember.computed.collect,
+        deprecatingAlias: Ember.computed.deprecatingAlias,
+        empty: Ember.computed.empty,
+        equal: Ember.computed.equal,
+        filter: Ember.computed.filter,
+        filterBy: Ember.computed.filterBy,
+        gt: Ember.computed.gt,
+        gte: Ember.computed.gte,
+        intersect: Ember.computed.intersect,
+        lt: Ember.computed.lt,
+        lte: Ember.computed.lte,
+        map: Ember.computed.map,
+        mapBy: Ember.computed.mapBy,
+        match: Ember.computed.match,
+        max: Ember.computed.max,
+        min: Ember.computed.min,
+        none: Ember.computed.none,
+        not: Ember.computed.not,
+        notEmpty: Ember.computed.notEmpty,
+        oneWay: Ember.computed.oneWay,
+        or: Ember.computed.or,
+        readOnly: Ember.computed.readOnly,
+        reads: Ember.computed.reads,
+        setDiff: Ember.computed.setDiff,
+        sort: Ember.computed.sort,
+        sum: Ember.computed.sum,
+        union: Ember.computed.union,
+        uniq: Ember.computed.uniq,
+        uniqBy: Ember.computed.uniqBy
+      },
       "@ember/object/mixin": { default: Ember.Mixin },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
       "@ember/routing/route": { default: Ember.Route },
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index 1861788a02..dde5bfb804 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -15,5 +16,5 @@ export default Component.extend({
   },
 
   attributeBindings: ["data-badge-name", "title"],
-  "data-badge-name": Ember.computed.alias("badge.name")
+  "data-badge-name": alias("badge.name")
 });
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index f4bc6eb49c..64942198ed 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -1,9 +1,10 @@
+import { alias, not } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Component.extend({
-  loadingMore: Ember.computed.alias("topicList.loadingMore"),
-  loading: Ember.computed.not("loaded"),
+  loadingMore: alias("topicList.loadingMore"),
+  loading: not("loaded"),
 
   @computed("topicList.loaded")
   loaded() {
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index 21992f108b..e420fcce7c 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -1,3 +1,4 @@
+import { alias, filter, or } from "@ember/object/computed";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
@@ -6,9 +7,9 @@ export default Component.extend({
   classNameBindings: ["hidden:hidden", ":category-breadcrumb"],
   tagName: "ol",
 
-  parentCategory: Ember.computed.alias("category.parentCategory"),
+  parentCategory: alias("category.parentCategory"),
 
-  parentCategories: Ember.computed.filter("categories", function(c) {
+  parentCategories: filter("categories", function(c) {
     if (
       c.id === this.site.get("uncategorized_category_id") &&
       !this.siteSettings.allow_uncategorized_topics
@@ -34,7 +35,7 @@ export default Component.extend({
     return this.site.mobileView && !category;
   },
 
-  firstCategory: Ember.computed.or("{parentCategory,category}"),
+  firstCategory: or("{parentCategory,category}"),
 
   @computed("category", "parentCategory")
   secondCategory(category, parentCategory) {
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
index 6b86bb39c6..8e4fd6c9f7 100644
--- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -1,3 +1,4 @@
+import { alias, equal } from "@ember/object/computed";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import {
@@ -19,9 +20,9 @@ const TITLES = {
 
 export default Component.extend({
   classNames: ["composer-action-title"],
-  options: Ember.computed.alias("model.replyOptions"),
-  action: Ember.computed.alias("model.action"),
-  isEditing: Ember.computed.equal("action", EDIT),
+  options: alias("model.replyOptions"),
+  action: alias("model.action"),
+  isEditing: equal("action", EDIT),
 
   @computed("options", "action")
   actionTitle(opts, action) {
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 82a4fceeaf..e9860973a2 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
@@ -16,7 +17,7 @@ export default Component.extend({
   _yourselfConfirm: null,
   similarTopics: null,
 
-  hidden: Ember.computed.not("composer.viewOpenOrFullscreen"),
+  hidden: not("composer.viewOpenOrFullscreen"),
 
   didInsertElement() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 540f1b36eb..907a4569db 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,3 +1,4 @@
+import { alias, or } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { debounce } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
@@ -13,8 +14,8 @@ import afterTransition from "discourse/lib/after-transition";
 
 export default Component.extend({
   classNames: ["title-input"],
-  watchForLink: Ember.computed.alias("composer.canEditTopicFeaturedLink"),
-  disabled: Ember.computed.or("composer.loading", "composer.disableTitleInput"),
+  watchForLink: alias("composer.canEditTopicFeaturedLink"),
+  disabled: or("composer.loading", "composer.disableTitleInput"),
 
   didInsertElement() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
index a5a20ac69a..96c29f9081 100644
--- a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { observes } from "ember-addons/ember-computed-decorators";
@@ -12,7 +13,7 @@ export default Component.extend({
   publicPostCount: null,
 
   requiredTopics: 5,
-  requiredPosts: Ember.computed.alias("siteSettings.tl1_requires_read_posts"),
+  requiredPosts: alias("siteSettings.tl1_requires_read_posts"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index b8ca7343cd..f82df037b7 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -1,3 +1,4 @@
+import { notEmpty, empty } from "@ember/object/computed";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
@@ -21,7 +22,7 @@ export default Component.extend({
     "type"
   ],
 
-  btnIcon: Ember.computed.notEmpty("icon"),
+  btnIcon: notEmpty("icon"),
 
   @computed("icon", "translatedLabel")
   btnType(icon, translatedLabel) {
@@ -32,7 +33,7 @@ export default Component.extend({
     }
   },
 
-  noText: Ember.computed.empty("translatedLabel"),
+  noText: empty("translatedLabel"),
 
   @computed("title")
   translatedTitle: {
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.es6
index b86b2a3a12..ec048ec730 100644
--- a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6
+++ b/app/assets/javascripts/discourse/components/date-time-input-range.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
   classNames: ["d-date-time-input-range"],
@@ -11,8 +12,8 @@ export default Component.extend({
   showToTime: true,
   error: null,
 
-  fromPanelActive: Ember.computed.equal("currentPanel", "from"),
-  toPanelActive: Ember.computed.equal("currentPanel", "to"),
+  fromPanelActive: equal("currentPanel", "from"),
+  toPanelActive: equal("currentPanel", "to"),
 
   _valid(state) {
     if (state.to < state.from) {
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
index 0df39dce25..112723ba12 100644
--- a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
+++ b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
@@ -1,3 +1,4 @@
+import { or } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import KeyValueStore from "discourse/lib/key-value-store";
@@ -79,7 +80,7 @@ export default Component.extend({
     }
   },
 
-  isEnabled: Ember.computed.or("isEnabledDesktop", "isEnabledPush"),
+  isEnabled: or("isEnabledDesktop", "isEnabledPush"),
 
   isPushNotificationsPreferred() {
     if (!this.site.mobileView) {
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 796e0a9068..c9484f6264 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { throttle } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
@@ -24,7 +25,7 @@ export default Component.extend(
   Scrolling,
   MobileScrollDirection,
   {
-    userFilters: Ember.computed.alias("topic.userFilters"),
+    userFilters: alias("topic.userFilters"),
     classNameBindings: [
       "multiSelect",
       "topic.archetype",
@@ -37,8 +38,8 @@ export default Component.extend(
     menuVisible: true,
     SHORT_POST: 1200,
 
-    postStream: Ember.computed.alias("topic.postStream"),
-    archetype: Ember.computed.alias("topic.archetype"),
+    postStream: alias("topic.postStream"),
+    archetype: alias("topic.archetype"),
     dockAt: 0,
 
     _lastShowTopic: null,
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
index 9988120e59..80d31ef4f2 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Category from "discourse/models/category";
@@ -10,7 +11,7 @@ export default buildCategoryPanel("general", {
     this.foregroundColors = ["FFFFFF", "000000"];
   },
 
-  canSelectParentCategory: Ember.computed.not(
+  canSelectParentCategory: not(
     "category.isUncategorizedCategory"
   ),
   uncategorizedSiteSettingLink: Discourse.getURL(
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
index bd2fe0661f..3161e31f35 100644
--- a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
 const EditCategoryPanel = Component.extend({});
 
@@ -6,7 +7,7 @@ export default EditCategoryPanel;
 export function buildCategoryPanel(tab, extras) {
   return EditCategoryPanel.extend(
     {
-      activeTab: Ember.computed.equal("selectedTab", tab),
+      activeTab: equal("selectedTab", tab),
       classNameBindings: [
         ":modal-tab",
         "activeTab::hide",
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
index c32f8b0553..5d692cc6eb 100644
--- a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
@@ -1,3 +1,4 @@
+import { empty, and } from "@ember/object/computed";
 import { setting } from "discourse/lib/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import computed from "ember-addons/ember-computed-decorators";
@@ -12,12 +13,12 @@ export function addCategorySortCriteria(criteria) {
 export default buildCategoryPanel("settings", {
   emailInEnabled: setting("email_in"),
   showPositionInput: setting("fixed_category_positions"),
-  isParentCategory: Ember.computed.empty("category.parent_category_id"),
-  showSubcategoryListStyle: Ember.computed.and(
+  isParentCategory: empty("category.parent_category_id"),
+  showSubcategoryListStyle: and(
     "category.show_subcategory_list",
     "isParentCategory"
   ),
-  isDefaultSortOrder: Ember.computed.empty("category.sort_order"),
+  isDefaultSortOrder: empty("category.sort_order"),
 
   @computed
   availableSubcategoryListStyles() {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
index 665975cf6b..700706ea1c 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
@@ -1,9 +1,10 @@
+import { empty, and } from "@ember/object/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
 export default buildCategoryPanel("tags", {
-  allowedTagsEmpty: Ember.computed.empty("category.allowed_tags"),
-  allowedTagGroupsEmpty: Ember.computed.empty("category.allowed_tag_groups"),
-  disableAllowGlobalTags: Ember.computed.and(
+  allowedTagsEmpty: empty("category.allowed_tags"),
+  allowedTagGroupsEmpty: empty("category.allowed_tag_groups"),
+  disableAllowGlobalTags: and(
     "allowedTagsEmpty",
     "allowedTagGroupsEmpty"
   )
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.es6
index c46af80e2f..6d0eccc99a 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,3 +1,4 @@
+import { alias, equal, or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
@@ -16,17 +17,17 @@ import {
 } from "discourse/controllers/edit-topic-timer";
 
 export default Component.extend({
-  selection: Ember.computed.alias("topicTimer.status_type"),
-  autoOpen: Ember.computed.equal("selection", OPEN_STATUS_TYPE),
-  autoClose: Ember.computed.equal("selection", CLOSE_STATUS_TYPE),
-  autoDelete: Ember.computed.equal("selection", DELETE_STATUS_TYPE),
-  autoBump: Ember.computed.equal("selection", BUMP_TYPE),
-  publishToCategory: Ember.computed.equal(
+  selection: alias("topicTimer.status_type"),
+  autoOpen: equal("selection", OPEN_STATUS_TYPE),
+  autoClose: equal("selection", CLOSE_STATUS_TYPE),
+  autoDelete: equal("selection", DELETE_STATUS_TYPE),
+  autoBump: equal("selection", BUMP_TYPE),
+  publishToCategory: equal(
     "selection",
     PUBLISH_TO_CATEGORY_STATUS_TYPE
   ),
-  reminder: Ember.computed.equal("selection", REMINDER_TYPE),
-  showTimeOnly: Ember.computed.or(
+  reminder: equal("selection", REMINDER_TYPE),
+  showTimeOnly: or(
     "autoOpen",
     "autoDelete",
     "reminder",
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
index d118b904c5..37dfd5ea10 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
@@ -1,3 +1,4 @@
+import { notEmpty, not } from "@ember/object/computed";
 import Component from "@ember/component";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
@@ -5,8 +6,8 @@ import UploadMixin from "discourse/mixins/upload";
 export default Component.extend(UploadMixin, {
   type: "emoji",
   uploadUrl: "/admin/customize/emojis",
-  hasName: Ember.computed.notEmpty("name"),
-  addDisabled: Ember.computed.not("hasName"),
+  hasName: notEmpty("name"),
+  addDisabled: not("hasName"),
 
   uploadOptions() {
     return {
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 3434ec2954..c42818914d 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -1,3 +1,4 @@
+import { and, not, equal } from "@ember/object/computed";
 import Component from "@ember/component";
 import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
 import computed from "ember-addons/ember-computed-decorators";
@@ -24,9 +25,9 @@ export default Component.extend({
     return flag === selectedFlag;
   },
 
-  showMessageInput: Ember.computed.and("flag.is_custom_flag", "selected"),
-  showDescription: Ember.computed.not("showMessageInput"),
-  isNotifyUser: Ember.computed.equal("flag.name_key", "notify_user"),
+  showMessageInput: and("flag.is_custom_flag", "selected"),
+  showDescription: not("showMessageInput"),
+  isNotifyUser: equal("flag.name_key", "notify_user"),
 
   @computed("flag.description", "flag.short_description")
   description(long_description, short_description) {
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
index 903f0886f0..1c627ec234 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -1,3 +1,4 @@
+import { equal, and, empty } from "@ember/object/computed";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -11,12 +12,12 @@ export default Component.extend({
   date: null,
   time: null,
   includeDateTime: true,
-  isCustom: Ember.computed.equal("selection", "pick_date_and_time"),
-  isBasedOnLastPost: Ember.computed.equal(
+  isCustom: equal("selection", "pick_date_and_time"),
+  isBasedOnLastPost: equal(
     "selection",
     "set_based_on_last_post"
   ),
-  displayDateAndTimePicker: Ember.computed.and("includeDateTime", "isCustom"),
+  displayDateAndTimePicker: and("includeDateTime", "isCustom"),
   displayLabel: null,
 
   init() {
@@ -37,7 +38,7 @@ export default Component.extend({
     }
   },
 
-  timeInputDisabled: Ember.computed.empty("date"),
+  timeInputDisabled: empty("date"),
 
   @observes("date", "time")
   _updateInput() {
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js.es6
index 8ab1969b62..246e7ab2a3 100644
--- a/app/assets/javascripts/discourse/components/google-search.js.es6
+++ b/app/assets/javascripts/discourse/components/google-search.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -5,7 +6,7 @@ export default Component.extend({
   classNames: ["google-search-form"],
   classNameBindings: ["hidden:hidden"],
 
-  hidden: Ember.computed.alias("siteSettings.login_required"),
+  hidden: alias("siteSettings.login_required"),
 
   @computed
   siteUrl() {
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
index 37e25cfb1c..bd6d029e49 100644
--- a/app/assets/javascripts/discourse/components/group-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
@@ -1,3 +1,4 @@
+import { alias, match, gt, or } from "@ember/object/computed";
 import Component from "@ember/component";
 import { setting } from "discourse/lib/computed";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -21,11 +22,11 @@ export default Component.extend(CardContentsBase, CleansUp, {
   allowBackgrounds: setting("allow_profile_backgrounds"),
   showBadges: setting("enable_badges"),
 
-  postStream: Ember.computed.alias("topic.postStream"),
-  viewingTopic: Ember.computed.match("currentPath", /^topic\./),
+  postStream: alias("topic.postStream"),
+  viewingTopic: match("currentPath", /^topic\./),
 
-  showMoreMembers: Ember.computed.gt("moreMembersCount", 0),
-  hasMembersOrIsMember: Ember.computed.or(
+  showMoreMembers: gt("moreMembersCount", 0),
+  hasMembersOrIsMember: or(
     "group.members",
     "group.is_group_owner_display",
     "group.is_group_user"
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index 00c0bb6201..b39049abbf 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -1,3 +1,4 @@
+import { lte } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -29,7 +30,7 @@ export default Component.extend({
     return !usernames || !(usernames.length > 0);
   },
 
-  showingFirst: Ember.computed.lte("currentPage", 1),
+  showingFirst: lte("currentPage", 1),
   showingLast: propertyEqual("currentPage", "totalPages"),
 
   actions: {
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.es6
index bca0af8297..cff51ffd73 100644
--- a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import Component from "@ember/component";
 import {
   default as computed,
@@ -22,7 +23,7 @@ export default Component.extend({
     }
   },
 
-  canEdit: Ember.computed.not("model.automatic"),
+  canEdit: not("model.automatic"),
 
   @computed("basicNameValidation", "uniqueNameValidation")
   nameValidation(basicNameValidation, uniqueNameValidation) {
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index 1d77546403..28e73eb0a2 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,3 +1,4 @@
+import { alias, not } from "@ember/object/computed";
 import Component from "@ember/component";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import { iconHTML } from "discourse-common/lib/icon-library";
@@ -7,8 +8,8 @@ export default Component.extend(
     classNameBindings: [":tip", "good", "bad"],
     rerenderTriggers: ["validation"],
 
-    bad: Ember.computed.alias("validation.failed"),
-    good: Ember.computed.not("bad"),
+    bad: alias("validation.failed"),
+    good: not("bad"),
 
     buildBuffer(buffer) {
       const reason = this.get("validation.reason");
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index c7f09e6bf3..513b9be366 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -1,3 +1,4 @@
+import { alias, and, equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { emailValid } from "discourse/lib/utilities";
@@ -9,8 +10,8 @@ import { i18n } from "discourse/lib/computed";
 export default Component.extend({
   tagName: null,
 
-  inviteModel: Ember.computed.alias("panel.model.inviteModel"),
-  userInvitedShow: Ember.computed.alias("panel.model.userInvitedShow"),
+  inviteModel: alias("panel.model.inviteModel"),
+  userInvitedShow: alias("panel.model.userInvitedShow"),
 
   // If this isn't defined, it will proxy to the user topic on the preferences
   // page which is wrong.
@@ -20,7 +21,7 @@ export default Component.extend({
   inviteIcon: "envelope",
   invitingExistingUserToTopic: false,
 
-  isAdmin: Ember.computed.alias("currentUser.admin"),
+  isAdmin: alias("currentUser.admin"),
 
   willDestroyElement() {
     this._super(...arguments);
@@ -137,18 +138,18 @@ export default Component.extend({
     return canInviteViaEmail && !isPM;
   },
 
-  topicId: Ember.computed.alias("inviteModel.id"),
+  topicId: alias("inviteModel.id"),
 
   // eg: visible only to specific group members
-  isPrivateTopic: Ember.computed.and(
+  isPrivateTopic: and(
     "invitingToTopic",
     "inviteModel.category.read_restricted"
   ),
 
-  isPM: Ember.computed.equal("inviteModel.archetype", "private_message"),
+  isPM: equal("inviteModel.archetype", "private_message"),
 
   // scope to allowed usernames
-  allowExistingMembers: Ember.computed.alias("invitingToTopic"),
+  allowExistingMembers: alias("invitingToTopic"),
 
   @computed("isAdmin", "inviteModel.group_users")
   isGroupOwnerOrAdmin(isAdmin, groupUsers) {
diff --git a/app/assets/javascripts/discourse/components/modal-tab.js.es6 b/app/assets/javascripts/discourse/components/modal-tab.js.es6
index 8508b37a87..94ff00ef9d 100644
--- a/app/assets/javascripts/discourse/components/modal-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/modal-tab.js.es6
@@ -1,3 +1,4 @@
+import { equal, alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 
@@ -8,8 +9,8 @@ export default Component.extend({
   selectedPanel: null,
   panelsLength: null,
   classNameBindings: ["isActive", "singleTab", "panel.id"],
-  singleTab: Ember.computed.equal("panelsLength", 1),
-  title: Ember.computed.alias("panel.title"),
+  singleTab: equal("panelsLength", 1),
+  title: alias("panel.title"),
   isActive: propertyEqual("panel.id", "selectedPanel.id"),
 
   click() {
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index 38e8fb1503..38930d57e4 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,3 +1,4 @@
+import { alias, not } from "@ember/object/computed";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import {
@@ -19,8 +20,8 @@ export default Component.extend(
       this.set("validation.lastShownAt", null);
     },
 
-    bad: Ember.computed.alias("validation.failed"),
-    good: Ember.computed.not("bad"),
+    bad: alias("validation.failed"),
+    good: not("bad"),
 
     @computed("shownAt", "validation.lastShownAt")
     lastShownAt(shownAt, lastShownAt) {
diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6 b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
index 1a11913067..2b3cc0fdf4 100644
--- a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
@@ -1,9 +1,10 @@
+import { gt, alias } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
   tagName: "",
 
-  multiple: Ember.computed.gt("bundle.actions.length", 1),
-  first: Ember.computed.alias("bundle.actions.firstObject"),
+  multiple: gt("bundle.actions.length", 1),
+  first: alias("bundle.actions.firstObject"),
 
   actions: {
     performById(id) {
diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
index 2a6c31051c..9fc360d10c 100644
--- a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
@@ -1,4 +1,5 @@
+import { gte } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
-  showUsername: Ember.computed.gte("index", 1)
+  showUsername: gte("index", 1)
 });
diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
index 607d70dbda..58c48d1bbf 100644
--- a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
@@ -1,3 +1,4 @@
+import { gt } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { longDate } from "discourse/lib/formatter";
@@ -5,7 +6,7 @@ import { historyHeat } from "discourse/widgets/post-edits-indicator";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
-  hasEdits: Ember.computed.gt("reviewable.post_version", 1),
+  hasEdits: gt("reviewable.post_version", 1),
 
   @computed("reviewable.post_updated_at")
   historyClass(updatedAt) {
diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6 b/app/assets/javascripts/discourse/components/reviewable-histories.js.es6
index 3bcf50b5e1..f52c1c4000 100644
--- a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-histories.js.es6
@@ -1,4 +1,5 @@
+import { filterBy } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
-  filteredHistories: Ember.computed.filterBy("histories", "created", false)
+  filteredHistories: filterBy("histories", "created", false)
 });
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6
index 45b9317145..81408e1efb 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/share-panel.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -7,9 +8,9 @@ import Sharing from "discourse/lib/sharing";
 export default Component.extend({
   tagName: null,
 
-  type: Ember.computed.alias("panel.model.type"),
+  type: alias("panel.model.type"),
 
-  topic: Ember.computed.alias("panel.model.topic"),
+  topic: alias("panel.model.topic"),
 
   @computed
   sources() {
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js.es6
index bc5dbe6531..551b70c93d 100644
--- a/app/assets/javascripts/discourse/components/tag-list.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-list.js.es6
@@ -1,3 +1,4 @@
+import { sort } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -5,7 +6,7 @@ export default Component.extend({
   classNameBindings: [":tag-list", "categoryClass", "tagGroupNameClass"],
 
   isPrivateMessage: false,
-  sortedTags: Ember.computed.sort("tags", "sortProperties"),
+  sortedTags: sort("tags", "sortProperties"),
 
   @computed("titleKey")
   title(titleKey) {
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js.es6
index 6ec44fb306..e636380a77 100644
--- a/app/assets/javascripts/discourse/components/time-input.js.es6
+++ b/app/assets/javascripts/discourse/components/time-input.js.es6
@@ -1,3 +1,4 @@
+import { oneWay, or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { isNumeric } from "discourse/lib/utilities";
@@ -6,11 +7,11 @@ export default Component.extend({
   classNames: ["d-time-input"],
   hours: null,
   minutes: null,
-  _hours: Ember.computed.oneWay("hours"),
-  _minutes: Ember.computed.oneWay("minutes"),
-  isSafari: Ember.computed.oneWay("capabilities.isSafari"),
-  isMobile: Ember.computed.oneWay("site.mobileView"),
-  nativePicker: Ember.computed.or("isSafari", "isMobile"),
+  _hours: oneWay("hours"),
+  _minutes: oneWay("minutes"),
+  isSafari: oneWay("capabilities.isSafari"),
+  isMobile: oneWay("site.mobileView"),
+  nativePicker: or("isSafari", "isMobile"),
 
   actions: {
     onInput(options, event) {
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index 6845dc6f12..8a54fff41a 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -1,3 +1,4 @@
+import { alias, or, and } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { getTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
@@ -31,11 +32,11 @@ export default Component.extend({
     return !isPM || this.siteSettings.enable_personal_messages;
   },
 
-  canInviteTo: Ember.computed.alias("topic.details.can_invite_to"),
+  canInviteTo: alias("topic.details.can_invite_to"),
 
-  canDefer: Ember.computed.alias("currentUser.enable_defer"),
+  canDefer: alias("currentUser.enable_defer"),
 
-  inviteDisabled: Ember.computed.or(
+  inviteDisabled: or(
     "topic.archived",
     "topic.closed",
     "topic.deleted"
@@ -50,7 +51,7 @@ export default Component.extend({
     );
   },
 
-  showEditOnFooter: Ember.computed.and(
+  showEditOnFooter: and(
     "topic.isPrivateMessage",
     "site.can_tag_pms"
   ),
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 771d5dfb35..6a99016545 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
@@ -34,7 +35,7 @@ export const ListItemDefaults = {
   tagName: "tr",
   classNameBindings: [":topic-list-item", "unboundClassNames", "topic.visited"],
   attributeBindings: ["data-topic-id"],
-  "data-topic-id": Ember.computed.alias("topic.id"),
+  "data-topic-id": alias("topic.id"),
 
   didInsertElement() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 870c68f9c8..6f60a3b417 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,3 +1,4 @@
+import { alias, reads } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import {
@@ -13,7 +14,7 @@ export default Component.extend(LoadMore, {
   listTitle: "topic.title",
 
   // Overwrite this to perform client side filtering of topics, if desired
-  filteredTopics: Ember.computed.alias("topics"),
+  filteredTopics: alias("topics"),
 
   _init: Ember.on("init", function() {
     this.addObserver("hideCategory", this.rerender);
@@ -32,7 +33,7 @@ export default Component.extend(LoadMore, {
     return !!this.changeSort;
   },
 
-  skipHeader: Ember.computed.reads("site.mobileView"),
+  skipHeader: reads("site.mobileView"),
 
   @computed("order")
   showLikes(order) {
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 19ec394b03..9d5cb2103f 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import {
@@ -10,7 +11,7 @@ export default Component.extend({
   classNameBindings: ["docked"],
   docked: false,
   progressPosition: null,
-  postStream: Ember.computed.alias("topic.postStream"),
+  postStream: alias("topic.postStream"),
   _streamPercentage: null,
 
   @computed("progressPosition")
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 e9ebcde33a..92fcde3b73 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,3 +1,4 @@
+import { alias, gte, and, gt, not, or } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import {
@@ -25,28 +26,28 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   allowBackgrounds: setting("allow_profile_backgrounds"),
   showBadges: setting("enable_badges"),
 
-  postStream: Ember.computed.alias("topic.postStream"),
-  enoughPostsForFiltering: Ember.computed.gte("topicPostCount", 2),
-  showFilter: Ember.computed.and(
+  postStream: alias("topic.postStream"),
+  enoughPostsForFiltering: gte("topicPostCount", 2),
+  showFilter: and(
     "viewingTopic",
     "postStream.hasNoFilters",
     "enoughPostsForFiltering"
   ),
   showName: propertyNotEqual("user.name", "user.username"),
-  hasUserFilters: Ember.computed.gt("postStream.userFilters.length", 0),
-  showMoreBadges: Ember.computed.gt("moreBadgesCount", 0),
-  showDelete: Ember.computed.and(
+  hasUserFilters: gt("postStream.userFilters.length", 0),
+  showMoreBadges: gt("moreBadgesCount", 0),
+  showDelete: and(
     "viewingAdmin",
     "showName",
     "user.canBeDeleted"
   ),
-  linkWebsite: Ember.computed.not("user.isBasic"),
-  hasLocationOrWebsite: Ember.computed.or("user.location", "user.website_name"),
-  isSuspendedOrHasBio: Ember.computed.or(
+  linkWebsite: not("user.isBasic"),
+  hasLocationOrWebsite: or("user.location", "user.website_name"),
+  isSuspendedOrHasBio: or(
     "user.suspend_reason",
     "user.bio_cooked"
   ),
-  showCheckEmail: Ember.computed.and("user.staged", "canCheckEmails"),
+  showCheckEmail: and("user.staged", "canCheckEmails"),
 
   user: null,
 
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6
index 2353dbd553..5873829a25 100644
--- a/app/assets/javascripts/discourse/components/user-info.js.es6
+++ b/app/assets/javascripts/discourse/components/user-info.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { userPath } from "discourse/lib/url";
@@ -16,10 +17,10 @@ export default Component.extend({
     return userPath(username);
   },
 
-  "data-username": Ember.computed.alias("user.username"),
+  "data-username": alias("user.username"),
 
   // TODO: In later ember releases `hasBlock` works without this
-  hasBlock: Ember.computed.alias("template"),
+  hasBlock: alias("template"),
 
   @computed("user.name", "user.username")
   name(name, username) {
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js.es6
index cdc7640bb2..6ea395e5f0 100644
--- a/app/assets/javascripts/discourse/components/user-link.js.es6
+++ b/app/assets/javascripts/discourse/components/user-link.js.es6
@@ -1,7 +1,8 @@
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
   tagName: "a",
   attributeBindings: ["href", "data-user-card"],
-  href: Ember.computed.alias("user.path"),
-  "data-user-card": Ember.computed.alias("user.username")
+  href: alias("user.path"),
+  "data-user-card": alias("user.username")
 });
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 90add32468..1f3fe86644 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,7 +1,8 @@
+import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
 export default Component.extend({
   classNames: ["user-stat"],
   type: "number",
-  isNumber: Ember.computed.equal("type", "number"),
-  isDuration: Ember.computed.equal("type", "duration")
+  isNumber: equal("type", "number"),
+  isDuration: equal("type", "duration")
 });
diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js.es6
index d238d976ef..85f26757ae 100644
--- a/app/assets/javascripts/discourse/controllers/about.js.es6
+++ b/app/assets/javascripts/discourse/controllers/about.js.es6
@@ -1,8 +1,9 @@
+import { gt } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  faqOverriden: Ember.computed.gt("siteSettings.faq_url.length", 0),
+  faqOverriden: gt("siteSettings.faq_url.length", 0),
 
   @computed
   contactInfo() {
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 e8df3c9772..0d8ac58ca2 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,3 +1,4 @@
+import { empty } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
@@ -19,7 +20,7 @@ export default Controller.extend({
     });
   },
 
-  disabled: Ember.computed.empty("notificationLevelId"),
+  disabled: empty("notificationLevelId"),
 
   actions: {
     changeNotificationLevel() {
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 6496ccb0be..1d16ba3282 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -11,10 +12,10 @@ export default Controller.extend(ModalFunctionality, {
   saving: false,
   new_user: null,
 
-  selectedPostsCount: Ember.computed.alias(
+  selectedPostsCount: alias(
     "topicController.selectedPostsCount"
   ),
-  selectedPostsUsername: Ember.computed.alias(
+  selectedPostsUsername: alias(
     "topicController.selectedPostsUsername"
   ),
 
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index a4ecfb8476..b68fb42a14 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import { and, or, alias, reads } from "@ember/object/computed";
 import { debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
@@ -94,9 +95,9 @@ export default Controller.extend({
   topic: null,
   linkLookup: null,
   showPreview: true,
-  forcePreview: Ember.computed.and("site.mobileView", "showPreview"),
-  whisperOrUnlistTopic: Ember.computed.or("isWhispering", "model.unlistTopic"),
-  categories: Ember.computed.alias("site.categoriesList"),
+  forcePreview: and("site.mobileView", "showPreview"),
+  whisperOrUnlistTopic: or("isWhispering", "model.unlistTopic"),
+  categories: alias("site.categoriesList"),
 
   @on("init")
   _setupPreview() {
@@ -178,7 +179,7 @@ export default Controller.extend({
     }
   }),
 
-  topicModel: Ember.computed.alias("topicController.model"),
+  topicModel: alias("topicController.model"),
 
   @computed("model.canEditTitle", "model.creatingPrivateMessage")
   canEditTags(canEditTitle, creatingPrivateMessage) {
@@ -200,9 +201,9 @@ export default Controller.extend({
     return editingPost && !canEditTags;
   },
 
-  isStaffUser: Ember.computed.reads("currentUser.staff"),
+  isStaffUser: reads("currentUser.staff"),
 
-  canUnlistTopic: Ember.computed.and("model.creatingTopic", "isStaffUser"),
+  canUnlistTopic: and("model.creatingTopic", "isStaffUser"),
 
   @computed("canWhisper", "replyingToWhisper")
   showWhisperToggle(canWhisper, replyingToWhisper) {
@@ -216,7 +217,7 @@ export default Controller.extend({
     );
   },
 
-  isWhispering: Ember.computed.or("replyingToWhisper", "model.whisper"),
+  isWhispering: or("replyingToWhisper", "model.whisper"),
 
   @computed("model.action", "isWhispering")
   saveIcon(action, isWhispering) {
@@ -590,7 +591,7 @@ export default Controller.extend({
     }
   },
 
-  disableSubmit: Ember.computed.or("model.loading", "isUploading"),
+  disableSubmit: or("model.loading", "isUploading"),
 
   save(force) {
     if (this.disableSubmit) return;
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index b6e6755da7..7a2e4b1359 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 { notEmpty, or, not } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -34,9 +35,9 @@ export default Controller.extend(
     userFields: null,
     isDeveloper: false,
 
-    hasAuthOptions: Ember.computed.notEmpty("authOptions"),
+    hasAuthOptions: notEmpty("authOptions"),
     canCreateLocal: setting("enable_local_logins"),
-    showCreateForm: Ember.computed.or("hasAuthOptions", "canCreateLocal"),
+    showCreateForm: or("hasAuthOptions", "canCreateLocal"),
 
     resetForm() {
       // We wrap the fields in a structure so we can assign a value
@@ -78,7 +79,7 @@ export default Controller.extend(
       return false;
     },
 
-    usernameRequired: Ember.computed.not("authOptions.omit_username"),
+    usernameRequired: not("authOptions.omit_username"),
 
     @computed
     fullnameRequired() {
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index 4b9afc6763..d286a37dab 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import DiscourseNavigation from "discourse/components/d-navigation";
@@ -24,7 +25,7 @@ const controllerOpts = {
 
 // Aliases for the values
 controllerOpts.queryParams.forEach(
-  p => (controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`))
+  p => (controllerOpts[p] = alias(`discoveryTopics.${p}`))
 );
 
 const SortableController = Controller.extend(controllerOpts);
@@ -32,7 +33,7 @@ const SortableController = Controller.extend(controllerOpts);
 export const addDiscoveryQueryParam = function(p, opts) {
   queryParams[p] = opts;
   const cOpts = {};
-  cOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`);
+  cOpts[p] = alias(`discoveryTopics.${p}`);
   cOpts["queryParams"] = Object.keys(queryParams);
   SortableController.reopen(cOpts);
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 5f23a85b33..6345bb8aa2 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,3 +1,4 @@
+import { alias, not } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
@@ -9,10 +10,10 @@ export default Controller.extend({
 
   loading: false,
 
-  category: Ember.computed.alias("navigationCategory.category"),
-  noSubcategories: Ember.computed.alias("navigationCategory.noSubcategories"),
+  category: alias("navigationCategory.category"),
+  noSubcategories: alias("navigationCategory.noSubcategories"),
 
-  loadedAllItems: Ember.computed.not("discoveryTopics.model.canLoadMore"),
+  loadedAllItems: not("discoveryTopics.model.canLoadMore"),
 
   _showFooter: function() {
     this.set("application.showFooter", this.loadedAllItems);
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index f0511bae37..66532a9952 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,3 +1,4 @@
+import { reads } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscoveryController from "discourse/controllers/discovery";
@@ -15,7 +16,7 @@ export default DiscoveryController.extend({
   // this makes sure the composer isn't scoping to a specific category
   category: null,
 
-  canEdit: Ember.computed.reads("currentUser.staff"),
+  canEdit: reads("currentUser.staff"),
 
   @computed("model.categories.[].featuredTopics.length")
   latestTopicOnly() {
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 9dc0c4b98c..859f621afb 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -1,3 +1,4 @@
+import { alias, not, gt, empty, notEmpty, equal } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import DiscoveryController from "discourse/controllers/discovery";
 import { queryParams } from "discourse/controllers/discovery-sortable";
@@ -14,9 +15,9 @@ const controllerOpts = {
 
   period: null,
 
-  canStar: Ember.computed.alias("currentUser.id"),
-  showTopicPostBadges: Ember.computed.not("discoveryTopics.new"),
-  redirectedReason: Ember.computed.alias(
+  canStar: alias("currentUser.id"),
+  showTopicPostBadges: not("discoveryTopics.new"),
+  redirectedReason: alias(
     "currentUser.redirected_to_top.reason"
   ),
 
@@ -118,16 +119,16 @@ const controllerOpts = {
     );
   },
 
-  hasTopics: Ember.computed.gt("model.topics.length", 0),
-  allLoaded: Ember.computed.empty("model.more_topics_url"),
+  hasTopics: gt("model.topics.length", 0),
+  allLoaded: empty("model.more_topics_url"),
   latest: endWith("model.filter", "latest"),
   new: endWith("model.filter", "new"),
-  top: Ember.computed.notEmpty("period"),
-  yearly: Ember.computed.equal("period", "yearly"),
-  quarterly: Ember.computed.equal("period", "quarterly"),
-  monthly: Ember.computed.equal("period", "monthly"),
-  weekly: Ember.computed.equal("period", "weekly"),
-  daily: Ember.computed.equal("period", "daily"),
+  top: notEmpty("period"),
+  yearly: equal("period", "yearly"),
+  quarterly: equal("period", "quarterly"),
+  monthly: equal("period", "monthly"),
+  weekly: equal("period", "weekly"),
+  daily: equal("period", "daily"),
 
   @computed("allLoaded", "model.topics.length")
   footerMessage(allLoaded, topicsLength) {
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 2e3f44ae74..7967f2d24a 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -1,3 +1,4 @@
+import { equal, gte, none, alias } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import {
@@ -43,10 +44,10 @@ export default Controller.extend({
     return false;
   },
 
-  isNotFound: Ember.computed.equal("thrown.status", 404),
-  isForbidden: Ember.computed.equal("thrown.status", 403),
-  isServer: Ember.computed.gte("thrown.status", 500),
-  isUnknown: Ember.computed.none("isNetwork", "isServer"),
+  isNotFound: equal("thrown.status", 404),
+  isForbidden: equal("thrown.status", 403),
+  isServer: gte("thrown.status", 500),
+  isUnknown: none("isNetwork", "isServer"),
 
   // TODO
   // make ajax requests to /srv/status with exponential backoff
@@ -75,7 +76,7 @@ export default Controller.extend({
     }
   },
 
-  requestUrl: Ember.computed.alias("thrown.requestedUrl"),
+  requestUrl: alias("thrown.requestedUrl"),
 
   @computed("networkFixed", "isNetwork", "isServer", "isUnknown")
   desc() {
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index 2b18533279..8f3c49ebc5 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -99,7 +100,7 @@ export default Controller.extend(ModalFunctionality, {
     return true;
   },
 
-  submitDisabled: Ember.computed.not("submitEnabled"),
+  submitDisabled: not("submitEnabled"),
 
   // Staff accounts can "take action"
   @computed("flagTopic", "selected.is_custom_flag")
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 7fdd47d57f..63e8da38fc 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,3 +1,4 @@
+import { or } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -207,7 +208,7 @@ export default Controller.extend({
     return page === PAGE_LIMIT;
   },
 
-  searchButtonDisabled: Ember.computed.or("searching", "loading"),
+  searchButtonDisabled: or("searching", "loading"),
 
   _search() {
     if (this.searching) {
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index 335a6a3b7d..2cc94f9f4e 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -15,7 +16,7 @@ export default Controller.extend({
   loading: false,
   limit: null,
   offset: null,
-  isOwner: Ember.computed.alias("model.is_group_owner"),
+  isOwner: alias("model.is_group_owner"),
   showActions: false,
   filter: null,
   filterInput: null,
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index 8b139e19b7..b261277a78 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -1,3 +1,4 @@
+import { alias, gt, not, or, equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
@@ -32,10 +33,10 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  previousFeaturedLink: Ember.computed.alias(
+  previousFeaturedLink: alias(
     "model.featured_link_changes.previous"
   ),
-  currentFeaturedLink: Ember.computed.alias(
+  currentFeaturedLink: alias(
     "model.featured_link_changes.current"
   ),
 
@@ -119,7 +120,7 @@ export default Controller.extend(ModalFunctionality, {
     return prev && current > prev;
   },
 
-  displayRevisions: Ember.computed.gt("model.version_count", 2),
+  displayRevisions: gt("model.version_count", 2),
   displayGoToFirst: propertyGreaterThan(
     "model.current_revision",
     "model.first_revision"
@@ -133,15 +134,15 @@ export default Controller.extend(ModalFunctionality, {
     "model.next_revision"
   ),
 
-  hideGoToFirst: Ember.computed.not("displayGoToFirst"),
-  hideGoToPrevious: Ember.computed.not("displayGoToPrevious"),
-  hideGoToNext: Ember.computed.not("displayGoToNext"),
-  hideGoToLast: Ember.computed.not("displayGoToLast"),
+  hideGoToFirst: not("displayGoToFirst"),
+  hideGoToPrevious: not("displayGoToPrevious"),
+  hideGoToNext: not("displayGoToNext"),
+  hideGoToLast: not("displayGoToLast"),
 
-  loadFirstDisabled: Ember.computed.or("loading", "hideGoToFirst"),
-  loadPreviousDisabled: Ember.computed.or("loading", "hideGoToPrevious"),
-  loadNextDisabled: Ember.computed.or("loading", "hideGoToNext"),
-  loadLastDisabled: Ember.computed.or("loading", "hideGoToLast"),
+  loadFirstDisabled: or("loading", "hideGoToFirst"),
+  loadPreviousDisabled: or("loading", "hideGoToPrevious"),
+  loadNextDisabled: or("loading", "hideGoToNext"),
+  loadLastDisabled: or("loading", "hideGoToLast"),
 
   @computed("model.previous_hidden")
   displayShow(prevHidden) {
@@ -173,7 +174,7 @@ export default Controller.extend(ModalFunctionality, {
     return this.currentUser && this.currentUser.get("staff");
   },
 
-  isEitherRevisionHidden: Ember.computed.or(
+  isEitherRevisionHidden: or(
     "model.previous_hidden",
     "model.current_hidden"
   ),
@@ -194,9 +195,9 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  displayingInline: Ember.computed.equal("viewMode", "inline"),
-  displayingSideBySide: Ember.computed.equal("viewMode", "side_by_side"),
-  displayingSideBySideMarkdown: Ember.computed.equal(
+  displayingInline: equal("viewMode", "inline"),
+  displayingSideBySide: equal("viewMode", "side_by_side"),
+  displayingSideBySideMarkdown: equal(
     "viewMode",
     "side_by_side_markdown"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index 98d5fd5496..a129165141 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -1,3 +1,4 @@
+import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import getUrl from "discourse-common/lib/get-url";
@@ -15,10 +16,10 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
-    invitedBy: Ember.computed.alias("model.invited_by"),
-    email: Ember.computed.alias("model.email"),
-    accountUsername: Ember.computed.alias("model.username"),
-    passwordRequired: Ember.computed.notEmpty("accountPassword"),
+    invitedBy: alias("model.invited_by"),
+    email: alias("model.email"),
+    accountUsername: alias("model.username"),
+    passwordRequired: notEmpty("accountPassword"),
     successMessage: null,
     errorMessage: null,
     userFields: null,
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index a0d4bd5950..363fffea88 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -6,7 +7,7 @@ export default Controller.extend(ModalFunctionality, {
   model: null,
   postNumber: null,
   postDate: null,
-  filteredPostsCount: Ember.computed.alias(
+  filteredPostsCount: alias(
     "topic.postStream.filteredPostsCount"
   ),
 
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 2501146805..177700eb72 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,3 +1,4 @@
+import { alias, or, readOnly } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
@@ -38,7 +39,7 @@ export default Controller.extend(ModalFunctionality, {
 
   canLoginLocal: setting("enable_local_logins"),
   canLoginLocalWithEmail: setting("enable_local_logins_via_email"),
-  loginRequired: Ember.computed.alias("application.loginRequired"),
+  loginRequired: alias("application.loginRequired"),
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
   resetForm() {
@@ -86,14 +87,14 @@ export default Controller.extend(ModalFunctionality, {
     return loggingIn ? "login.logging_in" : "login.title";
   },
 
-  loginDisabled: Ember.computed.or("loggingIn", "loggedIn"),
+  loginDisabled: or("loggingIn", "loggedIn"),
 
   @computed("loggingIn", "application.canSignUp")
   showSignupLink(loggingIn, canSignUp) {
     return canSignUp && !loggingIn;
   },
 
-  showSpinner: Ember.computed.readOnly("loggingIn"),
+  showSpinner: readOnly("loggingIn"),
 
   @computed("canLoginLocalWithEmail", "processingEmailLink")
   showLoginWithEmailLink(canLoginLocalWithEmail, processingEmailLink) {
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 7c8c84648c..3b1572c2f4 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,3 +1,4 @@
+import { alias, equal } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -12,13 +13,13 @@ export default Controller.extend(ModalFunctionality, {
   saving: false,
   categoryId: null,
   tags: null,
-  canAddTags: Ember.computed.alias("site.can_create_tag"),
-  canTagMessages: Ember.computed.alias("site.can_tag_pms"),
+  canAddTags: alias("site.can_create_tag"),
+  canTagMessages: alias("site.can_tag_pms"),
   selectedTopicId: null,
-  newTopic: Ember.computed.equal("selection", "new_topic"),
-  existingTopic: Ember.computed.equal("selection", "existing_topic"),
-  newMessage: Ember.computed.equal("selection", "new_message"),
-  existingMessage: Ember.computed.equal("selection", "existing_message"),
+  newTopic: equal("selection", "new_topic"),
+  existingTopic: equal("selection", "existing_topic"),
+  newMessage: equal("selection", "new_message"),
+  existingMessage: equal("selection", "existing_message"),
   participants: null,
 
   init() {
@@ -40,11 +41,11 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   topicController: inject("topic"),
-  selectedPostsCount: Ember.computed.alias(
+  selectedPostsCount: alias(
     "topicController.selectedPostsCount"
   ),
-  selectedAllPosts: Ember.computed.alias("topicController.selectedAllPosts"),
-  selectedPosts: Ember.computed.alias("topicController.selectedPosts"),
+  selectedAllPosts: alias("topicController.selectedAllPosts"),
+  selectedPosts: alias("topicController.selectedPosts"),
 
   @computed("saving", "selectedTopicId", "topicName")
   buttonDisabled(saving, selectedTopicId, topicName) {
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
index a54af35e2a..1b13265576 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
@@ -1,8 +1,9 @@
+import { none, and } from "@ember/object/computed";
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 
 export default NavigationDefaultController.extend({
-  showingParentCategory: Ember.computed.none("category.parentCategory"),
-  showingSubcategoryList: Ember.computed.and(
+  showingParentCategory: none("category.parentCategory"),
+  showingSubcategoryList: and(
     "category.show_subcategory_list",
     "showingParentCategory"
   )
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
index 618e7a3c43..b7a4545aed 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
@@ -1,3 +1,4 @@
+import { alias, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
@@ -8,12 +9,12 @@ import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
 export default Controller.extend(PasswordValidation, {
-  isDeveloper: Ember.computed.alias("model.is_developer"),
-  admin: Ember.computed.alias("model.admin"),
-  secondFactorRequired: Ember.computed.alias("model.second_factor_required"),
-  securityKeyRequired: Ember.computed.alias("model.security_key_required"),
-  backupEnabled: Ember.computed.alias("model.backup_enabled"),
-  securityKeyOrSecondFactorRequired: Ember.computed.or(
+  isDeveloper: alias("model.is_developer"),
+  admin: alias("model.admin"),
+  secondFactorRequired: alias("model.second_factor_required"),
+  securityKeyRequired: alias("model.security_key_required"),
+  backupEnabled: alias("model.backup_enabled"),
+  securityKeyOrSecondFactorRequired: or(
     "model.second_factor_required",
     "model.security_key_required"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 732c51ea73..27f4888b6d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -1,3 +1,4 @@
+import { not, or, gt } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
@@ -34,8 +35,8 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
 
   revoking: null,
 
-  cannotDeleteAccount: Ember.computed.not("currentUser.can_delete_account"),
-  deleteDisabled: Ember.computed.or(
+  cannotDeleteAccount: not("currentUser.can_delete_account"),
+  deleteDisabled: or(
     "model.isSaving",
     "deleting",
     "cannotDeleteAccount"
@@ -54,7 +55,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
     );
   },
 
-  canSelectTitle: Ember.computed.gt("model.availableTitles.length", 0),
+  canSelectTitle: gt("model.availableTitles.length", 0),
 
   @computed("model.filteredGroups")
   canSelectPrimaryGroup(primaryGroupOptions) {
@@ -129,7 +130,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
       : tokens.slice(0, DEFAULT_AUTH_TOKENS_COUNT);
   },
 
-  canShowAllAuthTokens: Ember.computed.gt(
+  canShowAllAuthTokens: gt(
     "model.user_auth_tokens.length",
     DEFAULT_AUTH_TOKENS_COUNT
   ),
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index b0ec789200..8f86974e38 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -35,7 +36,7 @@ export default Controller.extend(PreferencesTabController, {
     return this.siteSettings.remove_muted_tags_from_latest !== "never";
   },
 
-  canSave: Ember.computed.or("canSee", "currentUser.admin"),
+  canSave: or("canSee", "currentUser.admin"),
 
   actions: {
     save() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
index 9f59a93e4b..c25db36a43 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
@@ -1,3 +1,4 @@
+import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { propertyEqual } from "discourse/lib/computed";
 import InputValidation from "discourse/models/input-validation";
@@ -11,9 +12,9 @@ export default Controller.extend({
   success: false,
   newEmail: null,
 
-  newEmailEmpty: Ember.computed.empty("newEmail"),
+  newEmailEmpty: empty("newEmail"),
 
-  saveDisabled: Ember.computed.or(
+  saveDisabled: or(
     "saving",
     "newEmailEmpty",
     "taken",
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
index cc8d8aab4e..a2001457e5 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -10,11 +11,11 @@ const EMAIL_LEVELS = {
 };
 
 export default Controller.extend(PreferencesTabController, {
-  emailMessagesLevelAway: Ember.computed.equal(
+  emailMessagesLevelAway: equal(
     "model.user_option.email_messages_level",
     EMAIL_LEVELS.ONLY_WHEN_AWAY
   ),
-  emailLevelAway: Ember.computed.equal(
+  emailLevelAway: equal(
     "model.user_option.email_level",
     EMAIL_LEVELS.ONLY_WHEN_AWAY
   ),
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
index 04ad204320..233ed03390 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
@@ -1,3 +1,4 @@
+import { alias, and } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
@@ -15,11 +16,11 @@ export default Controller.extend(CanCheckEmails, {
   password: null,
   errorMessage: null,
   newUsername: null,
-  backupEnabled: Ember.computed.alias("model.second_factor_backup_enabled"),
+  backupEnabled: alias("model.second_factor_backup_enabled"),
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
   totps: null,
 
-  loaded: Ember.computed.and("secondFactorImage", "secondFactorKey"),
+  loaded: and("secondFactorImage", "secondFactorKey"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index 28d683a971..aab336e2b0 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -1,3 +1,4 @@
+import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import {
   default as computed,
@@ -16,8 +17,8 @@ export default Controller.extend({
 
   maxLength: setting("max_username_length"),
   minLength: setting("min_username_length"),
-  newUsernameEmpty: Ember.computed.empty("newUsername"),
-  saveDisabled: Ember.computed.or(
+  newUsernameEmpty: empty("newUsername"),
+  saveDisabled: or(
     "saving",
     "newUsernameEmpty",
     "taken",
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
index aca7b02fda..fc675cf052 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
@@ -1,11 +1,12 @@
+import { alias, gte, 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, {
-  ignoredUsernames: Ember.computed.alias("model.ignored_usernames"),
-  userIsMemberOrAbove: Ember.computed.gte("model.trust_level", 2),
-  ignoredEnabled: Ember.computed.or("userIsMemberOrAbove", "model.staff"),
+  ignoredUsernames: alias("model.ignored_usernames"),
+  userIsMemberOrAbove: gte("model.trust_level", 2),
+  ignoredEnabled: or("userIsMemberOrAbove", "model.staff"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
index 07a58388a2..fbdeb103a5 100644
--- a/app/assets/javascripts/discourse/controllers/raw-email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import Post from "discourse/models/post";
@@ -11,9 +12,9 @@ export default Controller.extend(ModalFunctionality, {
 
   tab: "raw",
 
-  showRawEmail: Ember.computed.equal("tab", "raw"),
-  showTextPart: Ember.computed.equal("tab", "text_part"),
-  showHtmlPart: Ember.computed.equal("tab", "html_part"),
+  showRawEmail: equal("tab", "raw"),
+  showTextPart: equal("tab", "text_part"),
+  showHtmlPart: equal("tab", "html_part"),
 
   onShow() {
     this.send("displayRaw");
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index c7dda8c792..93ebfd4165 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -1,3 +1,4 @@
+import { sort } from "@ember/object/computed";
 import EmberObjectProxy from "@ember/object/proxy";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -28,7 +29,7 @@ export default Controller.extend(ModalFunctionality, Ember.Evented, {
     return categories.map(c => bufProxy.create({ content: c }));
   },
 
-  categoriesOrdered: Ember.computed.sort(
+  categoriesOrdered: sort(
     "categoriesBuffered",
     "categoriesSorting"
   ),
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.es6
index 0bab180cb9..80a3b13edc 100644
--- a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
+++ b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -6,7 +7,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
-  reason: Ember.computed.alias("model.membership_request_template"),
+  reason: alias("model.membership_request_template"),
 
   @computed("model.name")
   title(groupName) {
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.es6
index 6554a77cd1..68c6c83211 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -8,8 +9,8 @@ export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
   successMessage: null,
-  backupEnabled: Ember.computed.alias("model.second_factor_backup_enabled"),
-  remainingCodes: Ember.computed.alias(
+  backupEnabled: alias("model.second_factor_backup_enabled"),
+  remainingCodes: alias(
     "model.second_factor_remaining_backup_codes"
   ),
   backupCodes: null,
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 632fe18c92..587e14da81 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
@@ -7,7 +8,7 @@ import { userPath } from "discourse/lib/url";
 export default Controller.extend({
   application: inject(),
 
-  showLoginButton: Ember.computed.equal("model.path", "login"),
+  showLoginButton: equal("model.path", "login"),
 
   @computed("model.path")
   bodyClass: path => `static-${path}`,
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
index 81457b585c..c2ec12fda6 100644
--- a/app/assets/javascripts/discourse/controllers/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
@@ -1,3 +1,4 @@
+import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import showModal from "discourse/lib/show-modal";
@@ -8,9 +9,9 @@ export default Controller.extend({
   sortedByCount: true,
   sortedByName: false,
 
-  canAdminTags: Ember.computed.alias("currentUser.staff"),
-  groupedByCategory: Ember.computed.notEmpty("model.extras.categories"),
-  groupedByTagGroup: Ember.computed.notEmpty("model.extras.tag_groups"),
+  canAdminTags: alias("currentUser.staff"),
+  groupedByCategory: notEmpty("model.extras.categories"),
+  groupedByTagGroup: notEmpty("model.extras.tag_groups"),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 3cccb318f3..9d787fe8a4 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import {
@@ -56,7 +57,7 @@ export default Controller.extend(BulkTopicSelection, {
   tag: null,
   additionalTags: null,
   list: null,
-  canAdminTag: Ember.computed.alias("currentUser.staff"),
+  canAdminTag: alias("currentUser.staff"),
   filterMode: null,
   navMode: "latest",
   loading: false,
@@ -69,7 +70,7 @@ export default Controller.extend(BulkTopicSelection, {
   max_posts: null,
   q: null,
 
-  categories: Ember.computed.alias("site.categoriesList"),
+  categories: alias("site.categoriesList"),
 
   @computed("list", "list.draft")
   createTopicLabel(list, listDraft) {
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index 6df0ba9ac8..d2a809fc6e 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -1,3 +1,4 @@
+import { empty, alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -71,8 +72,8 @@ addBulkButton("deleteTopics", "delete", {
 export default Controller.extend(ModalFunctionality, {
   tags: null,
 
-  emptyTags: Ember.computed.empty("tags"),
-  categoryId: Ember.computed.alias("model.category.id"),
+  emptyTags: empty("tags"),
+  categoryId: alias("model.category.id"),
 
   onShow() {
     const topics = this.get("model.topics");
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 06ac89f3ad..0f236ba80f 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,3 +1,4 @@
+import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
@@ -45,7 +46,7 @@ export default Controller.extend(bufferedProperty("model"), {
   selectedPostIds: null,
   editingTopic: false,
   queryParams: ["filter", "username_filters"],
-  loadedAllPosts: Ember.computed.or(
+  loadedAllPosts: or(
     "model.postStream.loadedAllPosts",
     "model.postStream.loadingLastPost"
   ),
@@ -59,7 +60,7 @@ export default Controller.extend(bufferedProperty("model"), {
   filter: null,
   quoteState: null,
 
-  canRemoveTopicFeaturedLink: Ember.computed.and(
+  canRemoveTopicFeaturedLink: and(
     "canEditTopicFeaturedLink",
     "buffered.featured_link"
   ),
@@ -140,7 +141,7 @@ export default Controller.extend(bufferedProperty("model"), {
     });
   },
 
-  showCategoryChooser: Ember.computed.not("model.isPrivateMessage"),
+  showCategoryChooser: not("model.isPrivateMessage"),
 
   gotoInbox(name) {
     let url = userPath(this.get("currentUser.username_lower") + "/messages");
@@ -1147,12 +1148,12 @@ export default Controller.extend(bufferedProperty("model"), {
     }
   },
 
-  hasError: Ember.computed.or("model.errorHtml", "model.errorMessage"),
-  noErrorYet: Ember.computed.not("hasError"),
+  hasError: or("model.errorHtml", "model.errorMessage"),
+  noErrorYet: not("hasError"),
 
-  categories: Ember.computed.alias("site.categoriesList"),
+  categories: alias("site.categoriesList"),
 
-  selectedPostsCount: Ember.computed.alias("selectedPostIds.length"),
+  selectedPostsCount: alias("selectedPostIds.length"),
 
   @computed(
     "selectedPostIds",
@@ -1201,7 +1202,7 @@ export default Controller.extend(bufferedProperty("model"), {
     return isMegaTopic ? false : !selectedAllPosts;
   },
 
-  canDeselectAll: Ember.computed.alias("selectedAllPosts"),
+  canDeselectAll: alias("selectedAllPosts"),
 
   @computed(
     "currentUser.staff",
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
index cfb051c1f2..87c73494a0 100644
--- a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import {
@@ -22,8 +23,8 @@ export default Controller.extend(ModalFunctionality, {
   showMore: false,
   imageUrl: null,
   imageLink: null,
-  local: Ember.computed.equal("selection", "local"),
-  remote: Ember.computed.equal("selection", "remote"),
+  local: equal("selection", "local"),
+  remote: equal("selection", "remote"),
   selection: "local",
 
   @computed()
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 237b06cb1d..596125d221 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -9,7 +10,7 @@ export default Controller.extend({
   user: inject(),
   userActionType: null,
 
-  canDownloadPosts: Ember.computed.alias("user.viewingSelf"),
+  canDownloadPosts: alias("user.viewingSelf"),
 
   _showFooter: function() {
     var showFooter;
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index a19984feb0..01df9566af 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,9 +1,10 @@
+import { alias, sort } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 export default Controller.extend({
   user: inject(),
-  username: Ember.computed.alias("user.model.username_lower"),
-  sortedBadges: Ember.computed.sort("model", "badgeSortOrder"),
+  username: alias("user.model.username_lower"),
+  sortedBadges: sort("model", "badgeSortOrder"),
 
   init() {
     this._super(...arguments);
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 7f2ef2ee87..8a8c102b0e 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -1,3 +1,4 @@
+import { equal, reads, gte } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import Invite from "discourse/models/invite";
 import debounce from "discourse/lib/debounce";
@@ -32,7 +33,7 @@ export default Controller.extend({
     );
   }, 250),
 
-  inviteRedeemed: Ember.computed.equal("filter", "redeemed"),
+  inviteRedeemed: equal("filter", "redeemed"),
 
   @computed("filter")
   showBulkActionButtons(filter) {
@@ -43,11 +44,11 @@ export default Controller.extend({
     );
   },
 
-  canInviteToForum: Ember.computed.reads("currentUser.can_invite_to_forum"),
+  canInviteToForum: reads("currentUser.can_invite_to_forum"),
 
-  canBulkInvite: Ember.computed.reads("currentUser.admin"),
+  canBulkInvite: reads("currentUser.admin"),
 
-  showSearch: Ember.computed.gte("totalInvites", 10),
+  showSearch: gte("totalInvites", 10),
 
   @computed("invitesCount.total", "invitesCount.pending")
   pendingLabel(invitesCountTotal, invitesCountPending) {
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 d7321e37cc..1d69acfee7 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -10,16 +11,16 @@ export default Controller.extend({
   user: inject(),
 
   pmView: false,
-  viewingSelf: Ember.computed.alias("user.viewingSelf"),
-  isGroup: Ember.computed.equal("pmView", "groups"),
-  currentPath: Ember.computed.alias("router._router.currentPath"),
-  selected: Ember.computed.alias("userTopicsList.selected"),
-  bulkSelectEnabled: Ember.computed.alias("userTopicsList.bulkSelectEnabled"),
+  viewingSelf: alias("user.viewingSelf"),
+  isGroup: equal("pmView", "groups"),
+  currentPath: alias("router._router.currentPath"),
+  selected: alias("userTopicsList.selected"),
+  bulkSelectEnabled: alias("userTopicsList.bulkSelectEnabled"),
   showToggleBulkSelect: true,
-  pmTaggingEnabled: Ember.computed.alias("site.can_tag_pms"),
+  pmTaggingEnabled: alias("site.can_tag_pms"),
   tagId: null,
 
-  showNewPM: Ember.computed.and(
+  showNewPM: and(
     "user.viewingSelf",
     "currentUser.can_send_private_messages"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index 4dd6db5573..7383cfa336 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
@@ -8,7 +9,7 @@ const MAX_BADGES = 6;
 
 export default Controller.extend({
   userController: inject("user"),
-  user: Ember.computed.alias("userController.model"),
+  user: alias("userController.model"),
 
   @computed("model.badges.length")
   moreBadges(badgesLength) {
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 81ce8051bd..3d4475db16 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,3 +1,4 @@
+import { alias, or, gt, not, and } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
@@ -12,7 +13,7 @@ export default Controller.extend(CanCheckEmails, {
   indexStream: false,
   router: service(),
   userNotifications: inject("user-notifications"),
-  currentPath: Ember.computed.alias("router._router.currentPath"),
+  currentPath: alias("router._router.currentPath"),
   adminTools: optionalService(),
 
   @computed("model.username")
@@ -38,17 +39,17 @@ export default Controller.extend(CanCheckEmails, {
     }
     return (!indexStream || viewingSelf) && !forceExpand;
   },
-  canMuteOrIgnoreUser: Ember.computed.or(
+  canMuteOrIgnoreUser: or(
     "model.can_ignore_user",
     "model.can_mute_user"
   ),
-  hasGivenFlags: Ember.computed.gt("model.number_of_flags_given", 0),
-  hasFlaggedPosts: Ember.computed.gt("model.number_of_flagged_posts", 0),
-  hasDeletedPosts: Ember.computed.gt("model.number_of_deleted_posts", 0),
-  hasBeenSuspended: Ember.computed.gt("model.number_of_suspensions", 0),
-  hasReceivedWarnings: Ember.computed.gt("model.warnings_received_count", 0),
+  hasGivenFlags: gt("model.number_of_flags_given", 0),
+  hasFlaggedPosts: gt("model.number_of_flagged_posts", 0),
+  hasDeletedPosts: gt("model.number_of_deleted_posts", 0),
+  hasBeenSuspended: gt("model.number_of_suspensions", 0),
+  hasReceivedWarnings: gt("model.warnings_received_count", 0),
 
-  showStaffCounters: Ember.computed.or(
+  showStaffCounters: or(
     "hasGivenFlags",
     "hasFlaggedPosts",
     "hasDeletedPosts",
@@ -61,7 +62,7 @@ export default Controller.extend(CanCheckEmails, {
     return !suspended || isStaff;
   },
 
-  linkWebsite: Ember.computed.not("model.isBasic"),
+  linkWebsite: not("model.isBasic"),
 
   @computed("model.trust_level")
   removeNoFollow(trustLevel) {
@@ -105,7 +106,7 @@ export default Controller.extend(CanCheckEmails, {
     return User.currentProp("can_invite_to_forum");
   },
 
-  canDeleteUser: Ember.computed.and(
+  canDeleteUser: and(
     "model.can_be_deleted",
     "model.can_delete_all_posts"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 11521e68eb..36e3236ffd 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
@@ -12,7 +13,7 @@ export default Controller.extend({
   group: null,
   exclude_usernames: null,
 
-  showTimeRead: Ember.computed.equal("period", "all"),
+  showTimeRead: equal("period", "all"),
 
   _setName: debounce(function() {
     this.set("name", this.nameInput);
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
index 15acb53454..311e47661d 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { on } from "ember-addons/ember-computed-decorators";
 import Mixin from "@ember/object/mixin";
@@ -6,7 +7,7 @@ export default Mixin.create({
   bulkSelectEnabled: false,
   selected: null,
 
-  canBulkSelect: Ember.computed.alias("currentUser.staff"),
+  canBulkSelect: alias("currentUser.staff"),
 
   @on("init")
   resetSelected() {
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index db18fbdd3e..eed27ec982 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -1,15 +1,16 @@
+import { and, alias, or } from "@ember/object/computed";
 import { propertyEqual, setting } from "discourse/lib/computed";
 import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("moderators_view_emails"),
-  canStaffCheckEmails: Ember.computed.and(
+  canStaffCheckEmails: and(
     "showEmailOnProfile",
     "currentUser.staff"
   ),
-  canAdminCheckEmails: Ember.computed.alias("currentUser.admin"),
-  canCheckEmails: Ember.computed.or(
+  canAdminCheckEmails: alias("currentUser.admin"),
+  canCheckEmails: or(
     "isCurrentUser",
     "canStaffCheckEmails",
     "canAdminCheckEmails"
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 41adfa3b02..e9c0c0df56 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,3 +1,4 @@
+import { alias, match } from "@ember/object/computed";
 import { throttle } from "@ember/runloop";
 import { next } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
@@ -11,8 +12,8 @@ export default Mixin.create({
   triggeringLinkClass: null, //the <a> classname where this card should appear
   _showCallback: null, //username, $target - load up data for when show is called, should call this._positionCard($target) when it's done.
 
-  postStream: Ember.computed.alias("topic.postStream"),
-  viewingTopic: Ember.computed.match("currentPath", /^topic\./),
+  postStream: alias("topic.postStream"),
+  viewingTopic: match("currentPath", /^topic\./),
 
   visible: false,
   username: null,
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
index 2ff5bdfe65..37502e3749 100644
--- a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -1,3 +1,4 @@
+import { empty } from "@ember/object/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import UserBadge from "discourse/models/user-badge";
 import { convertIconClass } from "discourse-common/lib/icon-library";
@@ -28,7 +29,7 @@ export default Mixin.create({
       .sort((a, b) => a.get("name").localeCompare(b.get("name")));
   },
 
-  noGrantableBadges: Ember.computed.empty("grantableBadges"),
+  noGrantableBadges: empty("grantableBadges"),
 
   @computed("selectedBadgeId", "grantableBadges")
   selectedBadgeGrantable(selectedBadgeId, grantableBadges) {
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js.es6
index 283a76981d..ce8259b9c0 100644
--- a/app/assets/javascripts/discourse/models/action-summary.js.es6
+++ b/app/assets/javascripts/discourse/models/action-summary.js.es6
@@ -1,9 +1,10 @@
+import { or } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default RestModel.extend({
-  canToggle: Ember.computed.or("can_undo", "can_act"),
+  canToggle: or("can_undo", "can_act"),
 
   // Remove it
   removeAction: function() {
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js.es6
index 9ba6e6744b..912a45b45c 100644
--- a/app/assets/javascripts/discourse/models/archetype.js.es6
+++ b/app/assets/javascripts/discourse/models/archetype.js.es6
@@ -1,8 +1,9 @@
+import { gt, not } from "@ember/object/computed";
 import { propertyEqual } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
 
 export default RestModel.extend({
-  hasOptions: Ember.computed.gt("options.length", 0),
+  hasOptions: gt("options.length", 0),
   isDefault: propertyEqual("id", "site.default_archetype"),
-  notDefault: Ember.computed.not("isDefault")
+  notDefault: not("isDefault")
 });
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index ed1378ac3b..ee0009246e 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -1,3 +1,4 @@
+import { none } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import BadgeGrouping from "discourse/models/badge-grouping";
@@ -5,7 +6,7 @@ import RestModel from "discourse/models/rest";
 import computed from "ember-addons/ember-computed-decorators";
 
 const Badge = RestModel.extend({
-  newBadge: Ember.computed.none("id"),
+  newBadge: none("id"),
 
   @computed
   url() {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 3a265ab342..f7fc3d7746 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -100,9 +101,9 @@ const Composer = RestModel.extend({
   draftSaving: false,
   draftSaved: false,
 
-  archetypes: Ember.computed.reads("site.archetypes"),
+  archetypes: reads("site.archetypes"),
 
-  sharedDraft: Ember.computed.equal("action", CREATE_SHARED_DRAFT),
+  sharedDraft: equal("action", CREATE_SHARED_DRAFT),
 
   @computed
   categoryId: {
@@ -140,11 +141,11 @@ const Composer = RestModel.extend({
       : null;
   },
 
-  creatingTopic: Ember.computed.equal("action", CREATE_TOPIC),
-  creatingSharedDraft: Ember.computed.equal("action", CREATE_SHARED_DRAFT),
-  creatingPrivateMessage: Ember.computed.equal("action", PRIVATE_MESSAGE),
-  notCreatingPrivateMessage: Ember.computed.not("creatingPrivateMessage"),
-  notPrivateMessage: Ember.computed.not("privateMessage"),
+  creatingTopic: equal("action", CREATE_TOPIC),
+  creatingSharedDraft: equal("action", CREATE_SHARED_DRAFT),
+  creatingPrivateMessage: equal("action", PRIVATE_MESSAGE),
+  notCreatingPrivateMessage: not("creatingPrivateMessage"),
+  notPrivateMessage: not("privateMessage"),
 
   @computed("editingPost", "topic.details.can_edit")
   disableTitleInput(editingPost, canEditTopic) {
@@ -164,17 +165,17 @@ const Composer = RestModel.extend({
     );
   },
 
-  topicFirstPost: Ember.computed.or("creatingTopic", "editingFirstPost"),
+  topicFirstPost: or("creatingTopic", "editingFirstPost"),
 
   @computed("action")
   editingPost: isEdit,
 
-  replyingToTopic: Ember.computed.equal("action", REPLY),
+  replyingToTopic: equal("action", REPLY),
 
-  viewOpen: Ember.computed.equal("composeState", OPEN),
-  viewDraft: Ember.computed.equal("composeState", DRAFT),
-  viewFullscreen: Ember.computed.equal("composeState", FULLSCREEN),
-  viewOpenOrFullscreen: Ember.computed.or("viewOpen", "viewFullscreen"),
+  viewOpen: equal("composeState", OPEN),
+  viewDraft: equal("composeState", DRAFT),
+  viewFullscreen: equal("composeState", FULLSCREEN),
+  viewOpenOrFullscreen: or("viewOpen", "viewFullscreen"),
 
   @observes("composeState")
   composeStateChanged() {
@@ -232,16 +233,16 @@ const Composer = RestModel.extend({
     false
   ),
 
-  editingFirstPost: Ember.computed.and("editingPost", "post.firstPost"),
+  editingFirstPost: and("editingPost", "post.firstPost"),
 
-  canEditTitle: Ember.computed.or(
+  canEditTitle: or(
     "creatingTopic",
     "creatingPrivateMessage",
     "editingFirstPost",
     "creatingSharedDraft"
   ),
 
-  canCategorize: Ember.computed.and(
+  canCategorize: and(
     "canEditTitle",
     "notCreatingPrivateMessage",
     "notPrivateMessage"
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 27adb809f7..3bc06e9d97 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -1,3 +1,4 @@
+import { notEmpty, equal } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import {
   default as computed,
@@ -22,7 +23,7 @@ const Group = RestModel.extend({
     this.set("owners", []);
   },
 
-  hasOwners: Ember.computed.notEmpty("owners"),
+  hasOwners: notEmpty("owners"),
 
   @computed("automatic_membership_email_domains")
   emailDomains(value) {
@@ -136,7 +137,7 @@ const Group = RestModel.extend({
       : null;
   },
 
-  canEveryoneMention: Ember.computed.equal("mentionable_level", 99),
+  canEveryoneMention: equal("mentionable_level", 99),
 
   @computed("visibility_level")
   isPrivate(visibilityLevel) {
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js.es6
index fc83f6282a..ef8541a168 100644
--- a/app/assets/javascripts/discourse/models/post-action-type.js.es6
+++ b/app/assets/javascripts/discourse/models/post-action-type.js.es6
@@ -1,7 +1,8 @@
+import { not } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 
 export const MAX_MESSAGE_LENGTH = 500;
 
 export default RestModel.extend({
-  notCustomFlag: Ember.computed.not("is_custom_flag")
+  notCustomFlag: not("is_custom_flag")
 });
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index a3b42bcaeb..8ee59d23fe 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -1,3 +1,4 @@
+import { or, not, and } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
 import RestModel from "discourse/models/rest";
@@ -43,13 +44,13 @@ export default RestModel.extend({
     });
   },
 
-  loading: Ember.computed.or(
+  loading: or(
     "loadingAbove",
     "loadingBelow",
     "loadingFilter",
     "stagingPost"
   ),
-  notLoading: Ember.computed.not("loading"),
+  notLoading: not("loading"),
 
   @computed("isMegaTopic", "stream.length", "topic.highest_post_number")
   filteredPostsCount(isMegaTopic, streamLength, topicHighestPostNumber) {
@@ -66,12 +67,12 @@ export default RestModel.extend({
     return hasPosts && filteredPostsCount > 0;
   },
 
-  canAppendMore: Ember.computed.and(
+  canAppendMore: and(
     "notLoading",
     "hasPosts",
     "lastPostNotLoaded"
   ),
-  canPrependMore: Ember.computed.and(
+  canPrependMore: and(
     "notLoading",
     "hasPosts",
     "firstPostNotLoaded"
@@ -85,7 +86,7 @@ export default RestModel.extend({
     return !!this.posts.findBy("id", firstPostId);
   },
 
-  firstPostNotLoaded: Ember.computed.not("firstPostPresent"),
+  firstPostNotLoaded: not("firstPostPresent"),
 
   firstId: null,
   lastId: null,
@@ -112,7 +113,7 @@ export default RestModel.extend({
     return !!this.posts.findBy("id", lastPostId);
   },
 
-  lastPostNotLoaded: Ember.computed.not("loadedAllPosts"),
+  lastPostNotLoaded: not("loadedAllPosts"),
 
   /**
     Returns a JS Object of current stream filter options. It should match the query
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 3e72627a10..77fe18dc87 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -36,13 +37,13 @@ const Post = RestModel.extend({
     }
   },
 
-  new_user: Ember.computed.equal("trust_level", 0),
-  firstPost: Ember.computed.equal("post_number", 1),
+  new_user: equal("trust_level", 0),
+  firstPost: equal("post_number", 1),
 
   // Posts can show up as deleted if the topic is deleted
-  deletedViaTopic: Ember.computed.and("firstPost", "topic.deleted_at"),
-  deleted: Ember.computed.or("deleted_at", "deletedViaTopic"),
-  notDeleted: Ember.computed.not("deleted"),
+  deletedViaTopic: and("firstPost", "topic.deleted_at"),
+  deleted: or("deleted_at", "deletedViaTopic"),
+  notDeleted: not("deleted"),
 
   @computed("name", "username")
   showName(name, username) {
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index d9199082fd..9ca2f5d0db 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -1,8 +1,9 @@
+import { equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 
 const RestModel = EmberObject.extend({
-  isNew: Ember.computed.equal("__state", "new"),
-  isCreated: Ember.computed.equal("__state", "created"),
+  isNew: equal("__state", "new"),
+  isCreated: equal("__state", "created"),
   isSaving: false,
 
   beforeCreate() {},
diff --git a/app/assets/javascripts/discourse/models/reviewable-history.js.es6 b/app/assets/javascripts/discourse/models/reviewable-history.js.es6
index 0b1b14f54e..dec1f37be5 100644
--- a/app/assets/javascripts/discourse/models/reviewable-history.js.es6
+++ b/app/assets/javascripts/discourse/models/reviewable-history.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 
 export const CREATED = 0;
@@ -5,5 +6,5 @@ export const TRANSITIONED_TO = 1;
 export const EDITED = 2;
 
 export default RestModel.extend({
-  created: Ember.computed.equal("reviewable_history_type", CREATED)
+  created: equal("reviewable_history_type", CREATED)
 });
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 2c09a478d0..46715900cd 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,3 +1,4 @@
+import { alias, sort } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 import Archetype from "discourse/models/archetype";
@@ -7,7 +8,7 @@ import RestModel from "discourse/models/rest";
 import PreloadStore from "preload-store";
 
 const Site = RestModel.extend({
-  isReadOnly: Ember.computed.alias("is_readonly"),
+  isReadOnly: alias("is_readonly"),
 
   init() {
     this._super(...arguments);
@@ -31,7 +32,7 @@ const Site = RestModel.extend({
     return postActionTypes.filterBy("is_flag", true);
   },
 
-  categoriesByCount: Ember.computed.sort("categories", "topicCountDesc"),
+  categoriesByCount: sort("categories", "topicCountDesc"),
 
   collectUserFields(fields) {
     fields = fields || {};
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index 25834624b3..d9c9b211de 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -1,3 +1,4 @@
+import { notEmpty } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
@@ -23,7 +24,7 @@ function displayCategoryInList(site, category) {
 }
 
 const TopicList = RestModel.extend({
-  canLoadMore: Ember.computed.notEmpty("more_topics_url"),
+  canLoadMore: notEmpty("more_topics_url"),
 
   forEachNew(topics, callback) {
     const topicIds = [];
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index de72adeed8..ddfcf58282 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -195,8 +196,8 @@ const Topic = RestModel.extend({
     });
   },
 
-  invisible: Ember.computed.not("visible"),
-  deleted: Ember.computed.notEmpty("deleted_at"),
+  invisible: not("visible"),
+  deleted: notEmpty("deleted_at"),
 
   @computed("id")
   searchContext(id) {
@@ -336,8 +337,8 @@ const Topic = RestModel.extend({
     return Discourse.Site.currentProp("archetypes").findBy("id", archetype);
   },
 
-  isPrivateMessage: Ember.computed.equal("archetype", "private_message"),
-  isBanner: Ember.computed.equal("archetype", "banner"),
+  isPrivateMessage: equal("archetype", "private_message"),
+  isBanner: equal("archetype", "banner"),
 
   toggleStatus(property) {
     this.toggleProperty(property);
@@ -496,7 +497,7 @@ const Topic = RestModel.extend({
     );
   },
 
-  isPinnedUncategorized: Ember.computed.and(
+  isPinnedUncategorized: and(
     "pinned",
     "category.isUncategorizedCategory"
   ),
@@ -538,7 +539,7 @@ const Topic = RestModel.extend({
     return emojiUnescape(excerpt);
   },
 
-  hasExcerpt: Ember.computed.notEmpty("excerpt"),
+  hasExcerpt: notEmpty("excerpt"),
 
   @computed("excerpt")
   excerptTruncated(excerpt) {
@@ -546,8 +547,8 @@ const Topic = RestModel.extend({
   },
 
   readLastPost: propertyEqual("last_read_post_number", "highest_post_number"),
-  canClearPin: Ember.computed.and("pinned", "readLastPost"),
-  canEditTags: Ember.computed.or("details.can_edit", "details.can_edit_tags"),
+  canClearPin: and("pinned", "readLastPost"),
+  canEditTags: or("details.can_edit", "details.can_edit_tags"),
 
   archiveMessage() {
     this.set("archiving", true);
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index 50600bc7fb..dbbfcc4c2e 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -1,3 +1,4 @@
+import { or, equal, and } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
@@ -75,9 +76,9 @@ const UserAction = RestModel.extend({
     return targetUsername === Discourse.User.currentProp("username");
   },
 
-  presentName: Ember.computed.or("name", "username"),
-  targetDisplayName: Ember.computed.or("target_name", "target_username"),
-  actingDisplayName: Ember.computed.or("acting_name", "acting_username"),
+  presentName: or("name", "username"),
+  targetDisplayName: or("target_name", "target_username"),
+  actingDisplayName: or("acting_name", "acting_username"),
 
   @computed("target_username")
   targetUserUrl(username) {
@@ -104,22 +105,22 @@ const UserAction = RestModel.extend({
     return postUrl(this.slug, this.topic_id, this.reply_to_post_number);
   },
 
-  replyType: Ember.computed.equal("action_type", UserActionTypes.replies),
-  postType: Ember.computed.equal("action_type", UserActionTypes.posts),
-  topicType: Ember.computed.equal("action_type", UserActionTypes.topics),
-  bookmarkType: Ember.computed.equal("action_type", UserActionTypes.bookmarks),
-  messageSentType: Ember.computed.equal(
+  replyType: equal("action_type", UserActionTypes.replies),
+  postType: equal("action_type", UserActionTypes.posts),
+  topicType: equal("action_type", UserActionTypes.topics),
+  bookmarkType: equal("action_type", UserActionTypes.bookmarks),
+  messageSentType: equal(
     "action_type",
     UserActionTypes.messages_sent
   ),
-  messageReceivedType: Ember.computed.equal(
+  messageReceivedType: equal(
     "action_type",
     UserActionTypes.messages_received
   ),
-  mentionType: Ember.computed.equal("action_type", UserActionTypes.mentions),
-  isPM: Ember.computed.or("messageSentType", "messageReceivedType"),
-  postReplyType: Ember.computed.or("postType", "replyType"),
-  removableBookmark: Ember.computed.and("bookmarkType", "sameUser"),
+  mentionType: equal("action_type", UserActionTypes.mentions),
+  isPM: or("messageSentType", "messageReceivedType"),
+  postReplyType: or("postType", "replyType"),
+  removableBookmark: and("bookmarkType", "sameUser"),
 
   addChild(action) {
     let groups = this.childGroups;
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 57c8a070b1..88910cd58e 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,3 +1,4 @@
+import { gt, equal, or } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
@@ -31,9 +32,9 @@ export const SECOND_FACTOR_METHODS = {
 const isForever = dt => moment().diff(dt, "years") < -500;
 
 const User = RestModel.extend({
-  hasPMs: Ember.computed.gt("private_messages_stats.all", 0),
-  hasStartedPMs: Ember.computed.gt("private_messages_stats.mine", 0),
-  hasUnreadPMs: Ember.computed.gt("private_messages_stats.unread", 0),
+  hasPMs: gt("private_messages_stats.all", 0),
+  hasStartedPMs: gt("private_messages_stats.mine", 0),
+  hasUnreadPMs: gt("private_messages_stats.unread", 0),
 
   redirected_to_top: {
     reason: null
@@ -204,10 +205,10 @@ const User = RestModel.extend({
     );
   },
 
-  isBasic: Ember.computed.equal("trust_level", 0),
-  isLeader: Ember.computed.equal("trust_level", 3),
-  isElder: Ember.computed.equal("trust_level", 4),
-  canManageTopic: Ember.computed.or("staff", "isElder"),
+  isBasic: equal("trust_level", 0),
+  isLeader: equal("trust_level", 3),
+  isElder: equal("trust_level", 4),
+  canManageTopic: or("staff", "isElder"),
 
   @computed("previous_visit_at")
   previousVisitAt(previous_visit_at) {
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.es6
index 42356a4854..d7c5f0aa06 100644
--- 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.es6
@@ -1,9 +1,10 @@
+import { or, and } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default EmberObject.extend({
-  postCountsPresent: Ember.computed.or("topic.unread", "topic.displayNewPosts"),
-  showBadges: Ember.computed.and("postBadgesEnabled", "postCountsPresent"),
+  postCountsPresent: or("topic.unread", "topic.displayNewPosts"),
+  showBadges: and("postBadgesEnabled", "postCountsPresent"),
 
   @computed
   newDotText() {
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6 b/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
index 46f239534d..291db6c238 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
@@ -1,10 +1,11 @@
+import { gt } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Component.extend({
   tagName: "",
 
-  showStatus: Ember.computed.gt("rs.status", 0),
+  showStatus: gt("rs.status", 0),
 
   @computed("rs.score_type.title", "reviewable.target_created_by")
   title(title, targetCreatedBy) {

From fc06cfa90ba44094cbb461bb65431c92c3d5fd04 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 31 Oct 2019 08:59:32 +1100
Subject: [PATCH 246/328] DEV: remove unused method

confirmed not used in all_the_plugins not used in core
---
 app/models/user.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9b27e1665b..0249ca5d0f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -595,11 +595,6 @@ class User < ActiveRecord::Base
     MessageBus.publish("/notification/#{id}", payload, user_ids: [id])
   end
 
-  # A selection of people to autocomplete on @mention
-  def self.mentionable_usernames
-    User.select(:username).order('last_posted_at desc').limit(20)
-  end
-
   def password=(password)
     # special case for passwordless accounts
     unless password.blank?

From d8f7f363cd90c897aac1586ffc3da9c17af04187 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 31 Oct 2019 09:01:26 +1100
Subject: [PATCH 247/328] FEATURE: stop updating last_posted_at on users for
 messages and whispers

This ensures we only update last_posted_at which is user facing for non messages
and non whispers.

We still update this date for secure categories, we do not revert it for
deleted posts.
---
 lib/post_creator.rb                  |  4 +++-
 lib/tasks/import.rake                | 11 ++++++-----
 spec/components/post_creator_spec.rb | 28 ++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index bb00ba335f..1b41fef5aa 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -526,7 +526,9 @@ class PostCreator
 
     @user.user_stat.save!
 
-    @user.update(last_posted_at: @post.created_at)
+    if !@topic.private_message? && @post.post_type != Post.types[:whisper]
+      @user.update(last_posted_at: @post.created_at)
+    end
   end
 
   def create_post_notice
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index c0fbefed8f..ca8fdc9486 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -384,12 +384,13 @@ end
 def update_users
   log "Updating users..."
 
-  DB.exec <<-SQL
+  DB.exec(<<~SQL, Archetype.private_message)
     WITH X AS (
-        SELECT user_id
-             , MIN(created_at) min_created_at
-             , MAX(created_at) max_created_at
-          FROM posts
+        SELECT p.user_id
+             , MIN(p.created_at) min_created_at
+             , MAX(p.created_at) max_created_at
+          FROM posts p
+          JOIN topics t ON t.id = p.topic_id AND t.archetype <> ?
          WHERE deleted_at IS NULL
       GROUP BY user_id
     )
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index c4decf5fa8..9dcb712723 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -139,11 +139,10 @@ describe PostCreator do
         cat.save
 
         created_post = nil
-        reply = nil
 
         messages = MessageBus.track_publish do
           created_post = PostCreator.new(admin, basic_topic_params.merge(category: cat.id)).create
-          reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id).create
+          _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
@@ -446,8 +445,8 @@ describe PostCreator do
             end
 
             it "creates missing tags if some exist" do
-              existing_tag1 = Fabricate(:tag, name: tag_names[0])
-              existing_tag1 = Fabricate(:tag, name: tag_names[1])
+              _existing_tag1 = Fabricate(:tag, name: tag_names[0])
+              _existing_tag1 = Fabricate(:tag, name: tag_names[1])
               expect { @post = creator_with_tags.create }.to change { Tag.count }.by(tag_names.size - 2)
               expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort)
             end
@@ -483,9 +482,16 @@ describe PostCreator do
     fab!(:topic) { Fabricate(:topic, user: user) }
 
     it 'whispers do not mess up the public view' do
-      first = PostCreator.new(user,
+
+      freeze_time
+
+      first = PostCreator.new(
+        user,
         topic_id: topic.id,
-        raw: 'this is the first post').create
+        raw: 'this is the first post'
+      ).create
+
+      freeze_time 1.year.from_now
 
       user_stat = user.user_stat
 
@@ -512,6 +518,9 @@ describe PostCreator do
 
       expect(user_stat.reload.post_count).to eq(0)
 
+      user.reload
+      expect(user.last_posted_at).to eq_time(1.year.ago)
+
       # date is not precise enough in db
       whisper_reply.reload
 
@@ -742,6 +751,10 @@ describe PostCreator do
     end
 
     it 'acts correctly' do
+      freeze_time
+
+      user.update_columns(last_posted_at: 1.year.ago)
+
       # It's not a warning
       expect(post.topic.user_warning).to be_blank
 
@@ -760,6 +773,9 @@ describe PostCreator do
       expect(post.user.user_stat.post_count).to eq(0)
       expect(post.user.user_stat.topic_count).to eq(0)
 
+      user.reload
+      expect(user.last_posted_at).to eq_time(1.year.ago)
+
       # archive this message and ensure archive is cleared for all users on reply
       UserArchivedMessage.create(user_id: target_user2.id, topic_id: post.topic_id)
 

From 02a886ce13fa62fcea5d39ad5f070636f68c13c5 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 30 Oct 2019 17:05:27 -0500
Subject: [PATCH 248/328] DEV: Import `Ember.on` from @ember/object/evented
 (#8268)

* DEV: Import `Ember.on` from @ember/object/evented

* Dont import "on" outsie of the js or admin app

* Fixed error when resolving merge conflicts
---
 app/assets/javascripts/admin/components/ace-editor.js.es6  | 3 ++-
 .../javascripts/admin/mixins/setting-component.js.es6      | 5 +++--
 app/assets/javascripts/discourse-loader.js                 | 1 +
 .../discourse/components/backup-uploader.js.es6            | 3 ++-
 .../javascripts/discourse/components/csv-uploader.js.es6   | 3 ++-
 .../javascripts/discourse/components/signup-cta.js.es6     | 4 +++-
 .../discourse/components/topic-list-item.js.es6            | 3 ++-
 .../javascripts/discourse/components/topic-list.js.es6     | 3 ++-
 .../javascripts/discourse/components/user-stream.js.es6    | 7 ++++---
 app/assets/javascripts/discourse/mixins/cleans-up.js.es6   | 6 ++++--
 app/assets/javascripts/discourse/mixins/upload.js.es6      | 5 +++--
 11 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index f7aca533e3..60498a0bdb 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,6 +1,7 @@
 import Component from "@ember/component";
 import loadScript from "discourse/lib/load-script";
 import { observes } from "ember-addons/ember-computed-decorators";
+import { on } from "@ember/object/evented";
 
 export default Component.extend({
   mode: "css",
@@ -49,7 +50,7 @@ export default Component.extend({
     }
   },
 
-  _destroyEditor: Ember.on("willDestroyElement", function() {
+  _destroyEditor: on("willDestroyElement", function() {
     if (this._editor) {
       this._editor.destroy();
       this._editor = null;
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index e90a10d37c..409c1b3359 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -1,6 +1,7 @@
 import { alias, oneWay } from "@ember/object/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
+import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
 
 const CUSTOM_TYPES = [
@@ -91,7 +92,7 @@ export default Mixin.create({
     return settingDefault !== bufferedValue;
   },
 
-  _watchEnterKey: Ember.on("didInsertElement", function() {
+  _watchEnterKey: on("didInsertElement", function() {
     $(this.element).on("keydown.setting-enter", ".input-setting-string", e => {
       if (e.keyCode === 13) {
         // enter key
@@ -100,7 +101,7 @@ export default Mixin.create({
     });
   }),
 
-  _removeBindings: Ember.on("willDestroyElement", function() {
+  _removeBindings: on("willDestroyElement", function() {
     $(this.element).off("keydown.setting-enter");
   }),
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 0cda325c30..59c3f4b62b 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -49,6 +49,7 @@ var define, requirejs;
       },
       "@ember/object/mixin": { default: Ember.Mixin },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
+      "@ember/object/evented": { on: Ember.on },
       "@ember/routing/route": { default: Ember.Route },
       "@ember/runloop": {
         bind: Ember.run.bind,
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
index 1e8a7059d6..e75470439d 100644
--- a/app/assets/javascripts/discourse/components/backup-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
@@ -3,6 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
+import { on } from "@ember/object/evented";
 
 export default Component.extend(UploadMixin, {
   tagName: "span",
@@ -35,7 +36,7 @@ export default Component.extend(UploadMixin, {
     };
   },
 
-  _init: Ember.on("didInsertElement", function() {
+  _init: on("didInsertElement", function() {
     const $upload = $(this.element);
 
     $upload.on("fileuploadadd", (e, data) => {
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index 7bd621d8ed..6fa3792d36 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -1,6 +1,7 @@
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
+import { on } from "@ember/object/evented";
 
 export default Component.extend(UploadMixin, {
   type: "csv",
@@ -32,7 +33,7 @@ export default Component.extend(UploadMixin, {
     return { autoUpload: false };
   },
 
-  _init: Ember.on("didInsertElement", function() {
+  _init: on("didInsertElement", function() {
     const $upload = $(this.element);
 
     $upload.on("fileuploadadd", (e, data) => {
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index 49536eff37..7d6f1623e4 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -1,5 +1,7 @@
 import { later } from "@ember/runloop";
 import Component from "@ember/component";
+import { on } from "@ember/object/evented";
+
 export default Component.extend({
   action: "showCreateAccount",
 
@@ -15,7 +17,7 @@ export default Component.extend({
     }
   },
 
-  _turnOffIfHidden: Ember.on("willDestroyElement", function() {
+  _turnOffIfHidden: on("willDestroyElement", function() {
     if (this.session.get("hideSignupCta")) {
       this.session.set("showSignupCta", false);
     }
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 6a99016545..10161d7b51 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -5,6 +5,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
+import { on } from "@ember/object/evented";
 
 export function showEntrance(e) {
   let target = $(e.target);
@@ -204,7 +205,7 @@ export const ListItemDefaults = {
     $topic.on("animationend", () => $topic.removeClass("highlighted"));
   },
 
-  _highlightIfNeeded: Ember.on("didInsertElement", function() {
+  _highlightIfNeeded: on("didInsertElement", function() {
     // highlight the last topic viewed
     if (this.session.get("lastTopicIdViewed") === this.get("topic.id")) {
       this.session.set("lastTopicIdViewed", null);
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 6f60a3b417..6d3ea337e2 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -6,6 +6,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
+import { on } from "@ember/object/evented";
 
 export default Component.extend(LoadMore, {
   tagName: "table",
@@ -16,7 +17,7 @@ export default Component.extend(LoadMore, {
   // Overwrite this to perform client side filtering of topics, if desired
   filteredTopics: alias("topics"),
 
-  _init: Ember.on("init", function() {
+  _init: on("init", function() {
     this.addObserver("hideCategory", this.rerender);
     this.addObserver("order", this.rerender);
     this.addObserver("ascending", this.rerender);
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index 16c7e1fb79..79543dd394 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -7,9 +7,10 @@ import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { on } from "@ember/object/evented";
 
 export default Component.extend(LoadMore, {
-  _initialize: Ember.on("init", function() {
+  _initialize: on("init", function() {
     const filter = this.get("stream.filter");
     if (filter) {
       this.set("classNames", [
@@ -27,7 +28,7 @@ export default Component.extend(LoadMore, {
     schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
-  _inserted: Ember.on("didInsertElement", function() {
+  _inserted: on("didInsertElement", function() {
     this.bindScrolling({ name: "user-stream-view" });
 
     $(window).on("resize.discourse-on-scroll", () => this.scrolled());
@@ -43,7 +44,7 @@ export default Component.extend(LoadMore, {
   }),
 
   // This view is being removed. Shut down operations
-  _destroyed: Ember.on("willDestroyElement", function() {
+  _destroyed: on("willDestroyElement", function() {
     this.unbindScrolling("user-stream-view");
     $(window).unbind("resize.discourse-on-scroll");
     $(this.element).off("click.details-disabled", "details.disabled");
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
index 3d85905eb5..ffbaf7a9ee 100644
--- a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
+++ b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
@@ -1,12 +1,14 @@
+import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
+
 // Include this mixin if you want to be notified when the dom should be
 // cleaned (usually on route change.)
 export default Mixin.create({
-  _initializeChooser: Ember.on("didInsertElement", function() {
+  _initializeChooser: on("didInsertElement", function() {
     this.appEvents.on("dom:clean", this, "cleanUp");
   }),
 
-  _clearChooser: Ember.on("willDestroyElement", function() {
+  _clearChooser: on("willDestroyElement", function() {
     this.appEvents.off("dom:clean", this, "cleanUp");
   })
 });
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 47eb37b2b9..a3b0d8626a 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -4,6 +4,7 @@ import {
 } from "discourse/lib/utilities";
 
 import getUrl from "discourse-common/lib/get-url";
+import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
 
 export default Mixin.create({
@@ -35,7 +36,7 @@ export default Mixin.create({
     return {};
   },
 
-  _initialize: Ember.on("didInsertElement", function() {
+  _initialize: on("didInsertElement", function() {
     const $upload = $(this.element);
     const reset = () =>
       this.setProperties({ uploading: false, uploadProgress: 0 });
@@ -105,7 +106,7 @@ export default Mixin.create({
     });
   }),
 
-  _destroy: Ember.on("willDestroyElement", function() {
+  _destroy: on("willDestroyElement", function() {
     this.messageBus && this.messageBus.unsubscribe("/uploads/" + this.type);
 
     const $upload = $(this.element);

From 13cca3eaa0efc8287085b8bfe45f647f9b33f745 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 31 Oct 2019 10:18:29 +1100
Subject: [PATCH 249/328] DEV: run files through prettier

2ae21e9 was prettiered using an old version of prettier.

This re-applies it using latest.
---
 .../admin/components/admin-report.js.es6      | 11 ++---------
 .../controllers/admin-badges-show.js.es6      |  4 +---
 .../admin-customize-themes-show.js.es6        |  5 +----
 .../admin/controllers/admin-user-index.js.es6 |  4 +---
 .../admin/models/admin-user.js.es6            | 10 ++--------
 .../components/edit-category-general.js.es6   |  4 +---
 .../components/edit-category-tags.js.es6      |  5 +----
 .../components/edit-topic-timer-form.js.es6   | 12 ++----------
 .../components/future-date-input.js.es6       |  5 +----
 .../components/topic-footer-buttons.js.es6    | 11 ++---------
 .../components/user-card-contents.js.es6      | 11 ++---------
 .../discourse/controllers/change-owner.js.es6 |  8 ++------
 .../controllers/discovery/topics.js.es6       |  4 +---
 .../discourse/controllers/history.js.es6      | 18 ++++--------------
 .../discourse/controllers/jump-to-post.js.es6 |  4 +---
 .../controllers/move-to-topic.js.es6          |  4 +---
 .../controllers/preferences/account.js.es6    |  6 +-----
 .../controllers/reorder-categories.js.es6     |  5 +----
 .../second-factor-backup-edit.js.es6          |  4 +---
 .../controllers/user-private-messages.js.es6  |  5 +----
 .../discourse/controllers/user.js.es6         | 10 ++--------
 .../discourse/mixins/can-check-emails.js.es6  |  5 +----
 .../discourse/models/post-stream.js.es6       | 19 +++----------------
 .../javascripts/discourse/models/topic.js.es6 |  5 +----
 .../discourse/models/user-action.js.es6       | 10 ++--------
 25 files changed, 38 insertions(+), 151 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index 025b9496f2..d0a841ca21 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -59,10 +59,7 @@ export default Component.extend({
   showTitle: true,
   showFilteringUI: false,
   showDatesOptions: alias("model.dates_filtering"),
-  showRefresh: or(
-    "showDatesOptions",
-    "model.available_filters.length"
-  ),
+  showRefresh: or("showDatesOptions", "model.available_filters.length"),
   shouldDisplayTrend: and("showTrend", "model.prev_period"),
 
   init() {
@@ -84,11 +81,7 @@ export default Component.extend({
     }
   },
 
-  showError: or(
-    "showTimeoutError",
-    "showExceptionError",
-    "showNotFoundError"
-  ),
+  showError: or("showTimeoutError", "showExceptionError", "showNotFoundError"),
   showNotFoundError: equal("model.error", "not_found"),
   showTimeoutError: equal("model.error", "timeout"),
   showExceptionError: equal("model.error", "exception"),
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 ddef8ce8a0..733f4589fe 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -14,9 +14,7 @@ export default Controller.extend(bufferedProperty("model"), {
   badgeTypes: alias("adminBadges.badgeTypes"),
   badgeGroupings: alias("adminBadges.badgeGroupings"),
   badgeTriggers: alias("adminBadges.badgeTriggers"),
-  protectedSystemFields: alias(
-    "adminBadges.protectedSystemFields"
-  ),
+  protectedSystemFields: alias("adminBadges.protectedSystemFields"),
 
   readOnly: alias("buffered.system"),
   showDisplayName: propertyNotEqual("name", "displayName"),
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.es6
index bb12b4e12b..2ef5ee09b6 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -149,10 +149,7 @@ export default Controller.extend({
       "scss"
     );
   },
-  sourceIsHttp: match(
-    "model.remote_theme.remote_url",
-    /^http(s)?:\/\//
-  ),
+  sourceIsHttp: match("model.remote_theme.remote_url", /^http(s)?:\/\//),
   actions: {
     updateToLatest() {
       this.set("updatingRemote", true);
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 18f5509db7..9a25f679ef 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -17,9 +17,7 @@ export default Controller.extend(CanCheckEmails, {
   userTitleValue: null,
 
   showBadges: setting("enable_badges"),
-  hasLockedTrustLevel: notEmpty(
-    "model.manual_locked_trust_level"
-  ),
+  hasLockedTrustLevel: notEmpty("model.manual_locked_trust_level"),
 
   primaryGroupDirty: propertyNotEqual(
     "originalPrimaryGroupId",
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index a33bac5e03..891a2923c6 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -12,14 +12,8 @@ const wrapAdmin = user => (user ? AdminUser.create(user) : null);
 
 const AdminUser = Discourse.User.extend({
   adminUserView: true,
-  customGroups: filter(
-    "groups",
-    g => !g.automatic && Group.create(g)
-  ),
-  automaticGroups: filter(
-    "groups",
-    g => g.automatic && Group.create(g)
-  ),
+  customGroups: filter("groups", g => !g.automatic && Group.create(g)),
+  automaticGroups: filter("groups", g => g.automatic && Group.create(g)),
 
   canViewProfile: or("active", "staged"),
 
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
index 80d31ef4f2..b293a89b76 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -11,9 +11,7 @@ export default buildCategoryPanel("general", {
     this.foregroundColors = ["FFFFFF", "000000"];
   },
 
-  canSelectParentCategory: not(
-    "category.isUncategorizedCategory"
-  ),
+  canSelectParentCategory: not("category.isUncategorizedCategory"),
   uncategorizedSiteSettingLink: Discourse.getURL(
     "/admin/site_settings/category/all_results?filter=allow_uncategorized_topics"
   ),
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
index 700706ea1c..aaca4b0e49 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
@@ -4,8 +4,5 @@ import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 export default buildCategoryPanel("tags", {
   allowedTagsEmpty: empty("category.allowed_tags"),
   allowedTagGroupsEmpty: empty("category.allowed_tag_groups"),
-  disableAllowGlobalTags: and(
-    "allowedTagsEmpty",
-    "allowedTagGroupsEmpty"
-  )
+  disableAllowGlobalTags: and("allowedTagsEmpty", "allowedTagGroupsEmpty")
 });
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.es6
index 6d0eccc99a..9bdf466e70 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -22,17 +22,9 @@ export default Component.extend({
   autoClose: equal("selection", CLOSE_STATUS_TYPE),
   autoDelete: equal("selection", DELETE_STATUS_TYPE),
   autoBump: equal("selection", BUMP_TYPE),
-  publishToCategory: equal(
-    "selection",
-    PUBLISH_TO_CATEGORY_STATUS_TYPE
-  ),
+  publishToCategory: equal("selection", PUBLISH_TO_CATEGORY_STATUS_TYPE),
   reminder: equal("selection", REMINDER_TYPE),
-  showTimeOnly: or(
-    "autoOpen",
-    "autoDelete",
-    "reminder",
-    "autoBump"
-  ),
+  showTimeOnly: or("autoOpen", "autoDelete", "reminder", "autoBump"),
 
   @computed(
     "topicTimer.updateTime",
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
index 1c627ec234..5f97d2bbd1 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -13,10 +13,7 @@ export default Component.extend({
   time: null,
   includeDateTime: true,
   isCustom: equal("selection", "pick_date_and_time"),
-  isBasedOnLastPost: equal(
-    "selection",
-    "set_based_on_last_post"
-  ),
+  isBasedOnLastPost: equal("selection", "set_based_on_last_post"),
   displayDateAndTimePicker: and("includeDateTime", "isCustom"),
   displayLabel: null,
 
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index 8a54fff41a..7c13728bff 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -36,11 +36,7 @@ export default Component.extend({
 
   canDefer: alias("currentUser.enable_defer"),
 
-  inviteDisabled: or(
-    "topic.archived",
-    "topic.closed",
-    "topic.deleted"
-  ),
+  inviteDisabled: or("topic.archived", "topic.closed", "topic.deleted"),
 
   @computed
   showAdminButton() {
@@ -51,10 +47,7 @@ export default Component.extend({
     );
   },
 
-  showEditOnFooter: and(
-    "topic.isPrivateMessage",
-    "site.can_tag_pms"
-  ),
+  showEditOnFooter: and("topic.isPrivateMessage", "site.can_tag_pms"),
 
   @computed("topic.message_archived")
   archiveIcon: archived => (archived ? "envelope" : "folder"),
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 92fcde3b73..023a7ab8a3 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -36,17 +36,10 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   showName: propertyNotEqual("user.name", "user.username"),
   hasUserFilters: gt("postStream.userFilters.length", 0),
   showMoreBadges: gt("moreBadgesCount", 0),
-  showDelete: and(
-    "viewingAdmin",
-    "showName",
-    "user.canBeDeleted"
-  ),
+  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_cooked"),
   showCheckEmail: and("user.staged", "canCheckEmails"),
 
   user: null,
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 1d16ba3282..ca45a50c83 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -12,12 +12,8 @@ export default Controller.extend(ModalFunctionality, {
   saving: false,
   new_user: null,
 
-  selectedPostsCount: alias(
-    "topicController.selectedPostsCount"
-  ),
-  selectedPostsUsername: alias(
-    "topicController.selectedPostsUsername"
-  ),
+  selectedPostsCount: alias("topicController.selectedPostsCount"),
+  selectedPostsUsername: alias("topicController.selectedPostsUsername"),
 
   @computed("saving", "new_user")
   buttonDisabled(saving, newUser) {
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 859f621afb..447e2ead37 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -17,9 +17,7 @@ const controllerOpts = {
 
   canStar: alias("currentUser.id"),
   showTopicPostBadges: not("discoveryTopics.new"),
-  redirectedReason: alias(
-    "currentUser.redirected_to_top.reason"
-  ),
+  redirectedReason: alias("currentUser.redirected_to_top.reason"),
 
   order: "default",
   ascending: false,
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index b261277a78..69ea502d41 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -33,12 +33,8 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  previousFeaturedLink: alias(
-    "model.featured_link_changes.previous"
-  ),
-  currentFeaturedLink: alias(
-    "model.featured_link_changes.current"
-  ),
+  previousFeaturedLink: alias("model.featured_link_changes.previous"),
+  currentFeaturedLink: alias("model.featured_link_changes.current"),
 
   previousTagChanges: customTagArray("model.tags_changes.previous"),
   currentTagChanges: customTagArray("model.tags_changes.current"),
@@ -174,10 +170,7 @@ export default Controller.extend(ModalFunctionality, {
     return this.currentUser && this.currentUser.get("staff");
   },
 
-  isEitherRevisionHidden: or(
-    "model.previous_hidden",
-    "model.current_hidden"
-  ),
+  isEitherRevisionHidden: or("model.previous_hidden", "model.current_hidden"),
 
   @computed("model.previous_hidden", "model.current_hidden", "displayingInline")
   hiddenClasses(prevHidden, currentHidden, displayingInline) {
@@ -197,10 +190,7 @@ export default Controller.extend(ModalFunctionality, {
 
   displayingInline: equal("viewMode", "inline"),
   displayingSideBySide: equal("viewMode", "side_by_side"),
-  displayingSideBySideMarkdown: equal(
-    "viewMode",
-    "side_by_side_markdown"
-  ),
+  displayingSideBySideMarkdown: equal("viewMode", "side_by_side_markdown"),
 
   @computed("displayingInline")
   inlineClass(displayingInline) {
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index 363fffea88..35981f39a7 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -7,9 +7,7 @@ export default Controller.extend(ModalFunctionality, {
   model: null,
   postNumber: null,
   postDate: null,
-  filteredPostsCount: alias(
-    "topic.postStream.filteredPostsCount"
-  ),
+  filteredPostsCount: alias("topic.postStream.filteredPostsCount"),
 
   onShow() {
     next(() => $("#post-jump").focus());
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 3b1572c2f4..eece1cd1bc 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -41,9 +41,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   topicController: inject("topic"),
-  selectedPostsCount: alias(
-    "topicController.selectedPostsCount"
-  ),
+  selectedPostsCount: alias("topicController.selectedPostsCount"),
   selectedAllPosts: alias("topicController.selectedAllPosts"),
   selectedPosts: alias("topicController.selectedPosts"),
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 27f4888b6d..1812fe8e70 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -36,11 +36,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
   revoking: null,
 
   cannotDeleteAccount: not("currentUser.can_delete_account"),
-  deleteDisabled: or(
-    "model.isSaving",
-    "deleting",
-    "cannotDeleteAccount"
-  ),
+  deleteDisabled: or("model.isSaving", "deleting", "cannotDeleteAccount"),
 
   reset() {
     this.set("passwordProgress", null);
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index 93ebfd4165..06d5f30cca 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -29,10 +29,7 @@ export default Controller.extend(ModalFunctionality, Ember.Evented, {
     return categories.map(c => bufProxy.create({ content: c }));
   },
 
-  categoriesOrdered: sort(
-    "categoriesBuffered",
-    "categoriesSorting"
-  ),
+  categoriesOrdered: sort("categoriesBuffered", "categoriesSorting"),
 
   @computed("categoriesBuffered.@each.hasBufferedChanges")
   showApplyAll() {
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.es6
index 68c6c83211..2801056c71 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
@@ -10,9 +10,7 @@ export default Controller.extend(ModalFunctionality, {
   errorMessage: null,
   successMessage: null,
   backupEnabled: alias("model.second_factor_backup_enabled"),
-  remainingCodes: alias(
-    "model.second_factor_remaining_backup_codes"
-  ),
+  remainingCodes: alias("model.second_factor_remaining_backup_codes"),
   backupCodes: null,
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
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 1d69acfee7..c6252978c9 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -20,10 +20,7 @@ export default Controller.extend({
   pmTaggingEnabled: alias("site.can_tag_pms"),
   tagId: null,
 
-  showNewPM: and(
-    "user.viewingSelf",
-    "currentUser.can_send_private_messages"
-  ),
+  showNewPM: and("user.viewingSelf", "currentUser.can_send_private_messages"),
 
   @computed("selected.[]", "bulkSelectEnabled")
   hasSelection(selected, bulkSelectEnabled) {
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 3d4475db16..914aff4aca 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -39,10 +39,7 @@ export default Controller.extend(CanCheckEmails, {
     }
     return (!indexStream || viewingSelf) && !forceExpand;
   },
-  canMuteOrIgnoreUser: or(
-    "model.can_ignore_user",
-    "model.can_mute_user"
-  ),
+  canMuteOrIgnoreUser: or("model.can_ignore_user", "model.can_mute_user"),
   hasGivenFlags: gt("model.number_of_flags_given", 0),
   hasFlaggedPosts: gt("model.number_of_flagged_posts", 0),
   hasDeletedPosts: gt("model.number_of_deleted_posts", 0),
@@ -106,10 +103,7 @@ export default Controller.extend(CanCheckEmails, {
     return User.currentProp("can_invite_to_forum");
   },
 
-  canDeleteUser: and(
-    "model.can_be_deleted",
-    "model.can_delete_all_posts"
-  ),
+  canDeleteUser: and("model.can_be_deleted", "model.can_delete_all_posts"),
 
   @computed("model.user_fields.@each.value")
   publicUserFields() {
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index eed27ec982..9e203da744 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -5,10 +5,7 @@ import Mixin from "@ember/object/mixin";
 export default Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("moderators_view_emails"),
-  canStaffCheckEmails: and(
-    "showEmailOnProfile",
-    "currentUser.staff"
-  ),
+  canStaffCheckEmails: and("showEmailOnProfile", "currentUser.staff"),
   canAdminCheckEmails: alias("currentUser.admin"),
   canCheckEmails: or(
     "isCurrentUser",
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 8ee59d23fe..60f3f8d69d 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -44,12 +44,7 @@ export default RestModel.extend({
     });
   },
 
-  loading: or(
-    "loadingAbove",
-    "loadingBelow",
-    "loadingFilter",
-    "stagingPost"
-  ),
+  loading: or("loadingAbove", "loadingBelow", "loadingFilter", "stagingPost"),
   notLoading: not("loading"),
 
   @computed("isMegaTopic", "stream.length", "topic.highest_post_number")
@@ -67,16 +62,8 @@ export default RestModel.extend({
     return hasPosts && filteredPostsCount > 0;
   },
 
-  canAppendMore: and(
-    "notLoading",
-    "hasPosts",
-    "lastPostNotLoaded"
-  ),
-  canPrependMore: and(
-    "notLoading",
-    "hasPosts",
-    "firstPostNotLoaded"
-  ),
+  canAppendMore: and("notLoading", "hasPosts", "lastPostNotLoaded"),
+  canPrependMore: and("notLoading", "hasPosts", "firstPostNotLoaded"),
 
   @computed("hasLoadedData", "firstPostId", "posts.[]")
   firstPostPresent(hasLoadedData, firstPostId) {
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index ddfcf58282..a4940d2c0a 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -497,10 +497,7 @@ const Topic = RestModel.extend({
     );
   },
 
-  isPinnedUncategorized: and(
-    "pinned",
-    "category.isUncategorizedCategory"
-  ),
+  isPinnedUncategorized: and("pinned", "category.isUncategorizedCategory"),
 
   clearPin() {
     // Clear the pin optimistically from the object
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index dbbfcc4c2e..5ca07e7025 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -109,14 +109,8 @@ const UserAction = RestModel.extend({
   postType: equal("action_type", UserActionTypes.posts),
   topicType: equal("action_type", UserActionTypes.topics),
   bookmarkType: equal("action_type", UserActionTypes.bookmarks),
-  messageSentType: equal(
-    "action_type",
-    UserActionTypes.messages_sent
-  ),
-  messageReceivedType: equal(
-    "action_type",
-    UserActionTypes.messages_received
-  ),
+  messageSentType: equal("action_type", UserActionTypes.messages_sent),
+  messageReceivedType: equal("action_type", UserActionTypes.messages_received),
   mentionType: equal("action_type", UserActionTypes.mentions),
   isPM: or("messageSentType", "messageReceivedType"),
   postReplyType: or("postType", "replyType"),

From 7a264217f20220d8735bacff9bd2dc4ecb9ee671 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 31 Oct 2019 05:45:57 +0530
Subject: [PATCH 250/328] FIX: default user preferenced categories are not
 updating in admin site setting UI.

---
 .../admin/components/site-setting.js.es6      | 58 +++++++++++--------
 .../templates/components/site-setting.hbs     |  2 +-
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 0b717f7223..3c3e394b9f 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -6,37 +6,45 @@ import showModal from "discourse/lib/show-modal";
 import AboutRoute from "discourse/routes/about";
 
 export default Component.extend(BufferedContent, SettingComponent, {
+  updateExistingUsers: null,
+
   _save() {
-    const defaultCategoriesSettings = [
-      "default_categories_watching",
-      "default_categories_tracking",
-      "default_categories_muted",
-      "default_categories_watching_first_post"
-    ];
     const setting = this.buffered;
-    const key = setting.get("setting");
-    const value = setting.get("value");
+    return SiteSetting.update(setting.get("setting"), setting.get("value"), {
+      updateExistingUsers: this.updateExistingUsers
+    });
+  },
 
-    if (defaultCategoriesSettings.includes(key)) {
-      AboutRoute.create()
-        .model()
-        .then(result => {
-          const controller = showModal("site-setting-default-categories", {
-            model: {
-              count: result.stats.user_count,
-              key: key.replace(/_/g, " ")
-            },
-            admin: true
-          });
+  actions: {
+    update() {
+      const defaultCategoriesSettings = [
+        "default_categories_watching",
+        "default_categories_tracking",
+        "default_categories_muted",
+        "default_categories_watching_first_post"
+      ];
+      const key = this.buffered.get("setting");
 
-          controller.set("onClose", () => {
-            return SiteSetting.update(key, value, {
-              updateExistingUsers: controller.updateExistingUsers
+      if (defaultCategoriesSettings.includes(key)) {
+        AboutRoute.create()
+          .model()
+          .then(result => {
+            const controller = showModal("site-setting-default-categories", {
+              model: {
+                count: result.stats.user_count,
+                key: key.replace(/_/g, " ")
+              },
+              admin: true
+            });
+
+            controller.set("onClose", () => {
+              this.updateExistingUsers = controller.updateExistingUsers;
+              this.send("save");
             });
           });
-        });
-    } else {
-      return SiteSetting.update(key, value);
+      } else {
+        this.send("save");
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 50fb7d413e..980c30986c 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -6,7 +6,7 @@
 </div>
 {{#if dirty}}
   <div class='setting-controls'>
-    {{d-button class="ok" action=(action "save") icon="check"}}
+    {{d-button class="ok" action=(action "update") icon="check"}}
     {{d-button class="cancel" action=(action "cancel") icon="times"}}
   </div>
 {{else if setting.overridden}}

From 0ba28e344b6979fc29b50fecdd9ab25e52114ac3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 31 Oct 2019 01:16:23 +0100
Subject: [PATCH 251/328] FIX: tags can be filtered on categoryId without a q
 param (#8264)

---
 app/controllers/tags_controller.rb    | 36 ++++++++++++++++++---------
 spec/requests/tags_controller_spec.rb |  8 ++++++
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 19629600ae..a8a766e653 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -193,28 +193,40 @@ class TagsController < ::ApplicationController
   end
 
   def search
-    clean_name = DiscourseTagging.clean_tag(params[:q])
-    category = params[:categoryId] ? Category.find_by_id(params[:categoryId]) : nil
+    filter_params = {
+      for_input: params[:filterForInput],
+      selected_tags: params[:selected_tags]
+    }
 
-    # Prioritize exact matches when ordering
-    order_query = Tag.sanitize_sql_for_order(
-      ["lower(name) = lower(?) DESC, topic_count DESC", clean_name]
-    )
+    if params[:categoryId]
+      filter_params[:category] = Category.find_by_id(params[:categoryId])
+    end
+
+    if params[:q]
+      clean_name = DiscourseTagging.clean_tag(params[:q])
+      filter_params[:term] = clean_name
+
+      # Prioritize exact matches when ordering
+      order_query = Tag.sanitize_sql_for_order(
+        ["lower(name) = lower(?) DESC, topic_count DESC", clean_name]
+      )
+
+      tag_query = Tag.order(order_query).limit(params[:limit])
+    else
+      tag_query = Tag.limit(params[:limit])
+    end
 
     tags_with_counts = DiscourseTagging.filter_allowed_tags(
-      Tag.order(order_query).limit(params[:limit]),
+      tag_query,
       guardian,
-      for_input: params[:filterForInput],
-      term: clean_name,
-      category: category,
-      selected_tags: params[:selected_tags]
+      filter_params
     )
 
     tags = self.class.tag_counts_json(tags_with_counts)
 
     json_response = { results: tags }
 
-    if !tags.find { |h| h[:id].downcase == clean_name.downcase } && tag = Tag.where_name(clean_name).first
+    if clean_name && !tags.find { |h| h[:id].downcase == clean_name.downcase } && tag = Tag.where_name(clean_name).first
       # filter_allowed_tags determined that the tag entered is not allowed
       json_response[:forbidden] = params[:q]
 
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 26bf959170..5d44da4e45 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -395,6 +395,14 @@ describe TagsController do
             category_names: category.name
           ))
         end
+
+        it "can filter on category without q param" do
+          nope = Fabricate(:tag, name: 'nope')
+          get "/tags/filter/search.json", params: { categoryId: category.id }
+          expect(response.status).to eq(200)
+          json = ::JSON.parse(response.body)
+          expect(json["results"].map { |j| j["id"] }.sort).to eq([yup.name])
+        end
       end
 
       it "matches tags after sanitizing input" do

From d35550612362c7ad18b99de454b1fc2a854399a8 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 31 Oct 2019 06:48:03 +0530
Subject: [PATCH 252/328] FEATURE: Option to update user preferences of all
 users when default site setting changed.

---
 .../admin/components/site-setting.js.es6      | 26 +++++-
 .../admin/site_settings_controller.rb         | 90 ++++++++++++++-----
 .../admin/site_settings_controller_spec.rb    | 34 +++++++
 3 files changed, 123 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 3c3e394b9f..0289f4cdf4 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -17,15 +17,35 @@ export default Component.extend(BufferedContent, SettingComponent, {
 
   actions: {
     update() {
-      const defaultCategoriesSettings = [
+      const defaultUserPreferences = [
+        "default_email_digest_frequency",
+        "default_include_tl0_in_digests",
+        "default_email_level",
+        "default_email_messages_level",
+        "default_email_mailing_list_mode",
+        "default_email_mailing_list_mode_frequency",
+        "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_notification_level_when_replying",
+        "default_other_external_links_in_new_tab",
+        "default_other_enable_quoting",
+        "default_other_enable_defer",
+        "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_first_post"
+        "default_categories_watching_first_post",
+        "default_text_size",
+        "default_title_count_mode"
       ];
       const key = this.buffered.get("setting");
 
-      if (defaultCategoriesSettings.includes(key)) {
+      if (defaultUserPreferences.includes(key)) {
         AboutRoute.create()
           .model()
           .then(result => {
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 7a066924c3..fdc6179187 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -21,38 +21,80 @@ class Admin::SiteSettingsController < Admin::AdminController
     end
 
     update_existing_users = params[:updateExistingUsers].present?
-    previous_category_ids = (SiteSetting.send(id) || "").split("|") if update_existing_users
+    previous_value = SiteSetting.send(id) || "" if update_existing_users
 
     SiteSetting.set_and_log(id, value, current_user)
 
     if update_existing_users
-      new_category_ids = (value || "").split("|")
+      user_options = {
+        default_email_mailing_list_mode: "mailing_list_mode",
+        default_email_mailing_list_mode_frequency: "mailing_list_mode_frequency",
+        default_email_level: "email_level",
+        default_email_messages_level: "email_messages_level",
+        default_topics_automatic_unpin: "automatically_unpin_topics",
+        default_email_previous_replies: "email_previous_replies",
+        default_email_in_reply_to: "email_in_reply_to",
+        default_other_enable_quoting: "enable_quoting",
+        default_other_enable_defer: "enable_defer",
+        default_other_external_links_in_new_tab: "external_links_in_new_tab",
+        default_other_dynamic_favicon: "dynamic_favicon",
+        default_other_new_topic_duration_minutes: "new_topic_duration_minutes",
+        default_other_auto_track_topics_after_msecs: "auto_track_topics_after_msecs",
+        default_other_notification_level_when_replying: "notification_level_when_replying",
+        default_other_like_notification_frequency: "like_notification_frequency",
+        default_email_digest_frequency: "digest_after_minutes",
+        default_include_tl0_in_digests: "include_tl0_in_digests",
+        default_text_size: "text_size_key",
+        default_title_count_mode: "title_count_mode_key"
+      }
 
-      case id
-      when "default_categories_watching"
-        notification_level = NotificationLevels.all[:watching]
-      when "default_categories_tracking"
-        notification_level = NotificationLevels.all[:tracking]
-      when "default_categories_muted"
-        notification_level = NotificationLevels.all[:muted]
-      when "default_categories_watching_first_post"
-        notification_level = NotificationLevels.all[:watching_first_post]
-      end
+      new_value = value || ""
 
-      (previous_category_ids - new_category_ids).each do |category_id|
-        CategoryUser.where(category_id: category_id, notification_level: notification_level).delete_all
-      end
-
-      (new_category_ids - previous_category_ids).each do |category_id|
-        skip_user_ids = CategoryUser.where(category_id: category_id).pluck(:user_id)
-
-        User.where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
-          category_users = []
-          users.each { |user| category_users << { category_id: category_id, user_id: user.id, notification_level: notification_level } }
-          CategoryUser.insert_all!(category_users)
+      if (user_option = user_options[id.to_sym]).present?
+        if user_option == "text_size_key"
+          previous_value = UserOption.text_sizes[previous_value.to_sym]
+          new_value = UserOption.text_sizes[new_value.to_sym]
+        elsif user_option == "title_count_mode_key"
+          previous_value = UserOption.title_count_modes[previous_value.to_sym]
+          new_value = UserOption.title_count_modes[new_value.to_sym]
         end
 
-        CategoryUser.where(category_id: category_id, notification_level: notification_level).first_or_create!(notification_level: notification_level)
+        UserOption.where(user_option => previous_value).update_all(user_option => new_value)
+
+        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
+      elsif id.start_with?("default_categories_")
+        previous_category_ids = previous_value.split("|")
+        new_category_ids = new_value.split("|")
+
+        case id
+        when "default_categories_watching"
+          notification_level = NotificationLevels.all[:watching]
+        when "default_categories_tracking"
+          notification_level = NotificationLevels.all[:tracking]
+        when "default_categories_muted"
+          notification_level = NotificationLevels.all[:muted]
+        when "default_categories_watching_first_post"
+          notification_level = NotificationLevels.all[:watching_first_post]
+        end
+
+        (previous_category_ids - new_category_ids).each do |category_id|
+          CategoryUser.where(category_id: category_id, notification_level: notification_level).delete_all
+        end
+
+        (new_category_ids - previous_category_ids).each do |category_id|
+          skip_user_ids = CategoryUser.where(category_id: category_id).pluck(:user_id)
+
+          User.where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
+            category_users = []
+            users.each { |user| category_users << { category_id: category_id, user_id: user.id, notification_level: notification_level } }
+            CategoryUser.insert_all!(category_users)
+          end
+
+          CategoryUser.where(category_id: category_id, notification_level: notification_level).first_or_create!(notification_level: notification_level)
+        end
       end
     end
 
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 3d3d70ca56..7e035d7b7a 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -53,6 +53,40 @@ describe Admin::SiteSettingsController do
         expect(SiteSetting.test_setting).to eq('')
       end
 
+      describe 'default user options' do
+        let!(:user1) { Fabricate(:user) }
+        let!(:user2) { Fabricate(:user) }
+
+        it 'should update all existing user options' do
+          user2.user_option.email_in_reply_to = false
+          user2.user_option.save!
+
+          expect {
+            put "/admin/site_settings/default_email_in_reply_to.json", params: {
+              default_email_in_reply_to: false,
+              updateExistingUsers: true
+            }
+          }.to change { UserOption.where(email_in_reply_to: false).count }.by(User.count - 1)
+        end
+
+        it 'should not update existing user options' do
+          expect {
+            put "/admin/site_settings/default_email_in_reply_to.json", params: {
+              default_email_in_reply_to: false
+            }
+          }.to change { UserOption.where(email_in_reply_to: false).count }.by(0)
+        end
+
+        it 'should disable email digests in existing user options' do
+          expect {
+            put "/admin/site_settings/default_email_digest_frequency.json", params: {
+              default_email_digest_frequency: 0,
+              updateExistingUsers: true
+            }
+          }.to change { UserOption.where(email_digests: false).count }.by(User.count)
+        end
+      end
+
       describe 'default categories' do
         let(:user1) { Fabricate(:user) }
         let(:user2) { Fabricate(:user) }

From c5e67726fde016e64649d7b6de1ca24cf62a81c0 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 31 Oct 2019 17:15:41 +1100
Subject: [PATCH 253/328] FIX: under some conditions draft would say it was
 saving when not

This is a major change to draft internals. Previously there were quite a
few cases where the draft system would say "draft saved", when in fact
we just skipped saving.

This commit ensures the draft system deals with draft ownership handover in
a predictable way.

For example:

- Window 1 editing draft
- Window 2 editing same draft at the same time

Previously we would allow window 1 and 2 to just fight on the same draft
each window overwriting the same draft over an over.

This commit introduces an ownership concept where either window 1 or 2 win
and user is prompted on the loser window to reload screen to correct the issue

This also corrects edge cases where a user could have multiple browser windows
open and posts in 1 window, later to post in the second window. Previously
drafts would break in the second window, this corrects it.
---
 .../discourse/models/composer.js.es6          |  31 ++++-
 .../javascripts/discourse/models/draft.js.es6 |   4 +-
 app/controllers/draft_controller.rb           |  47 +++++++-
 app/models/draft.rb                           | 110 +++++++++++++++---
 config/locales/server.en.yml                  |   4 +
 .../20191031042212_add_owner_to_drafts.rb     |   6 +
 spec/models/draft_spec.rb                     |  73 ++++++++++--
 spec/requests/draft_controller_spec.rb        |  95 ++++++++++++++-
 spec/services/user_destroyer_spec.rb          |   2 +-
 9 files changed, 333 insertions(+), 39 deletions(-)
 create mode 100644 db/migrate/20191031042212_add_owner_to_drafts.rb

diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index f7fc3d7746..217f48eb62 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1059,8 +1059,16 @@ const Composer = RestModel.extend({
       data.originalText = this.originalText;
     }
 
-    return Draft.save(this.draftKey, this.draftSequence, data)
+    return Draft.save(
+      this.draftKey,
+      this.draftSequence,
+      data,
+      this.messageBus.clientId
+    )
       .then(result => {
+        if (result.draft_sequence) {
+          this.draftSequence = result.draft_sequence;
+        }
         if (result.conflict_user) {
           this.setProperties({
             draftSaving: false,
@@ -1075,10 +1083,27 @@ const Composer = RestModel.extend({
           });
         }
       })
-      .catch(() => {
+      .catch(e => {
+        let draftStatus;
+        const xhr = e && e.jqXHR;
+
+        if (
+          xhr &&
+          xhr.status === 409 &&
+          xhr.responseJSON &&
+          xhr.responseJSON.errors &&
+          xhr.responseJSON.errors.length
+        ) {
+          const json = e.jqXHR.responseJSON;
+          draftStatus = json.errors[0];
+          if (json.extras && json.extras.description) {
+            bootbox.alert(json.extras.description);
+          }
+        }
+
         this.setProperties({
           draftSaving: false,
-          draftStatus: I18n.t("composer.drafts_offline"),
+          draftStatus: draftStatus || I18n.t("composer.drafts_offline"),
           draftConflictUser: null
         });
       });
diff --git a/app/assets/javascripts/discourse/models/draft.js.es6 b/app/assets/javascripts/discourse/models/draft.js.es6
index abba8511f5..62fefef8c7 100644
--- a/app/assets/javascripts/discourse/models/draft.js.es6
+++ b/app/assets/javascripts/discourse/models/draft.js.es6
@@ -21,11 +21,11 @@ Draft.reopenClass({
     return current;
   },
 
-  save(key, sequence, data) {
+  save(key, sequence, data, clientId) {
     data = typeof data === "string" ? data : JSON.stringify(data);
     return ajax("/draft.json", {
       type: "POST",
-      data: { draft_key: key, sequence, data }
+      data: { draft_key: key, sequence, data, owner: clientId }
     });
   }
 });
diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb
index 95f62c862a..9537634cd7 100644
--- a/app/controllers/draft_controller.rb
+++ b/app/controllers/draft_controller.rb
@@ -11,7 +11,41 @@ class DraftController < ApplicationController
   end
 
   def update
-    Draft.set(current_user, params[:draft_key], params[:sequence].to_i, params[:data])
+    sequence =
+      begin
+        Draft.set(
+          current_user,
+          params[:draft_key],
+          params[:sequence].to_i,
+          params[:data],
+          params[:owner]
+        )
+      rescue Draft::OutOfSequence
+
+        begin
+          if !Draft.exists?(user_id: current_user.id, draft_key: params[:draft_key])
+            Draft.set(
+              current_user,
+              params[:draft_key],
+              DraftSequence.current(current_user, params[:draft_key]),
+              params[:data],
+              params[:owner]
+            )
+          else
+            raise Draft::OutOfSequence
+          end
+
+        rescue Draft::OutOfSequence
+          render_json_error I18n.t('draft.sequence_conflict_error.title'),
+            status: 409,
+            extras: {
+              description: I18n.t('draft.sequence_conflict_error.description')
+            }
+          return
+        end
+      end
+
+    json = success_json.merge(draft_sequence: sequence)
 
     if data = JSON::parse(params[:data])
       # this is a bit of a kludge we need to remove (all the parsing) too many special cases here
@@ -20,16 +54,21 @@ class DraftController < ApplicationController
         post = Post.find_by(id: data["postId"])
         if post && post.raw != data["originalText"]
           conflict_user = BasicUserSerializer.new(post.last_editor, root: false)
-          return render json: success_json.merge(conflict_user: conflict_user)
+          render json: json.merge(conflict_user: conflict_user)
+          return
         end
       end
     end
 
-    render json: success_json
+    render json: json
   end
 
   def destroy
-    Draft.clear(current_user, params[:draft_key], params[:sequence].to_i)
+    begin
+      Draft.clear(current_user, params[:draft_key], params[:sequence].to_i)
+    rescue Draft::OutOfSequence
+      # nothing really we can do here, if try clearing a draft that is not ours, just skip it.
+    end
     render json: success_json
   end
 
diff --git a/app/models/draft.rb b/app/models/draft.rb
index c31186cf57..610b8ef26d 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -5,44 +5,122 @@ class Draft < ActiveRecord::Base
   NEW_PRIVATE_MESSAGE ||= 'new_private_message'
   EXISTING_TOPIC ||= 'topic_'
 
-  def self.set(user, key, sequence, data)
+  class OutOfSequence < StandardError; end
+
+  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
 
-    if d = find_draft(user, key)
-      return if d.sequence > sequence
+    # this is called a lot so we should micro optimize here
+    draft_id, current_owner, current_sequence = DB.query_single(<<~SQL, user_id: user.id, key: key)
+      WITH draft AS (
+        SELECT id, owner FROM drafts
+        WHERE
+          user_id = :user_id AND
+          draft_key = :key
+      ),
+      draft_sequence AS (
+        SELECT sequence
+        FROM draft_sequences
+        WHERE
+          user_id = :user_id AND
+          draft_key = :key
+      )
 
-      DB.exec(<<~SQL, id: d.id, sequence: sequence, data: data)
+      SELECT
+        (SELECT id FROM draft),
+        (SELECT owner FROM draft),
+        (SELECT sequence FROM draft_sequence)
+    SQL
+
+    current_sequence ||= 0
+
+    if draft_id
+      if current_sequence != sequence
+        raise Draft::OutOfSequence
+      end
+
+      if owner && current_owner && current_owner != owner
+        sequence += 1
+
+        DraftSequence.upsert({
+            sequence: sequence,
+            draft_key: key,
+            user_id: user.id,
+          },
+          unique_by: [:user_id, :draft_key]
+        )
+      end
+
+      DB.exec(<<~SQL, id: draft_id, sequence: sequence, data: data, owner: owner || current_owner)
         UPDATE drafts
            SET sequence = :sequence
              , data = :data
              , revisions = revisions + 1
+             , owner = :owner
          WHERE id = :id
       SQL
+
+    elsif sequence != current_sequence
+      raise Draft::OutOfSequence
     else
-      Draft.create!(user_id: user.id, draft_key: key, data: data, sequence: sequence)
+      Draft.create!(
+        user_id: user.id,
+        draft_key: key,
+        data: data,
+        sequence: sequence,
+        owner: owner
+      )
     end
 
-    true
+    sequence
   end
 
   def self.get(user, key, sequence)
-    d = find_draft(user, key)
-    d.data if d && d.sequence == sequence
+
+    opts = {
+      user_id: user.id,
+      draft_key: key,
+      sequence: sequence
+    }
+
+    current_sequence, data, draft_sequence = DB.query_single(<<~SQL, opts)
+      WITH draft AS (
+        SELECT data, sequence
+        FROM drafts
+        WHERE draft_key = :draft_key AND user_id = :user_id
+      ),
+      draft_sequence AS (
+        SELECT sequence
+        FROM draft_sequences
+        WHERE draft_key = :draft_key AND user_id = :user_id
+      )
+      SELECT
+        ( SELECT sequence FROM draft_sequence) ,
+        ( SELECT data FROM draft ),
+        ( SELECT sequence FROM draft )
+    SQL
+
+    current_sequence ||= 0
+
+    if sequence != current_sequence
+      raise Draft::OutOfSequence
+    end
+
+    data if current_sequence == draft_sequence
   end
 
   def self.clear(user, key, sequence)
-    d = find_draft(user, key)
-    d.destroy if d && d.sequence <= sequence
-  end
+    current_sequence = DraftSequence.current(user, key)
 
-  def self.find_draft(user, key)
-    if user.is_a?(User)
-      find_by(user_id: user.id, draft_key: key)
-    else
-      find_by(user_id: user, draft_key: key)
+    # bad caller is a reason to complain
+    if sequence != current_sequence
+      raise Draft::OutOfSequence
     end
+
+    # corrupt data is not a reason not to leave data
+    Draft.where(user_id: user.id, draft_key: key).destroy_all
   end
 
   def self.stream(opts = nil)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4686244be0..969cd73aef 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -871,6 +871,10 @@ en:
       short_description: "Like this post"
       long_form: "liked this"
 
+  draft:
+    sequence_conflict_error:
+      title: "draft error"
+      description: "Draft is being edited in another window. Please reload this page."
   draft_backup:
     pm_title: "Backup Drafts from ongoing topics"
     pm_body: "Topic containing backup drafts"
diff --git a/db/migrate/20191031042212_add_owner_to_drafts.rb b/db/migrate/20191031042212_add_owner_to_drafts.rb
new file mode 100644
index 0000000000..3f33cfda9e
--- /dev/null
+++ b/db/migrate/20191031042212_add_owner_to_drafts.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddOwnerToDrafts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :drafts, :owner, :string
+  end
+end
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index fff8b8d579..1d6050fdaa 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -17,15 +17,15 @@ describe Draft do
         random_key: "random"
       }
 
-      Draft.set(user, "new_private_message", 0, draft.to_json)
+      Draft.set(user, "xyz", 0, draft.to_json)
       draft["reply"] = "test" * 100
 
       half_grace = (SiteSetting.editing_grace_period / 2 + 1).seconds
 
       freeze_time half_grace.from_now
-      Draft.set(user, "new_private_message", 77, draft.to_json)
+      Draft.set(user, "xyz", 0, draft.to_json)
 
-      draft_post = BackupDraftPost.find_by(user_id: user.id, key: "new_private_message").post
+      draft_post = BackupDraftPost.find_by(user_id: user.id, key: "xyz").post
 
       expect(draft_post.revisions.count).to eq(0)
 
@@ -33,7 +33,7 @@ describe Draft do
 
       # this should trigger a post revision as 10 minutes have passed
       draft["reply"] = "hello"
-      Draft.set(user, "new_private_message", 77, draft.to_json)
+      Draft.set(user, "xyz", 0, draft.to_json)
 
       draft_topic = BackupDraftTopic.find_by(user_id: user.id)
       expect(draft_topic.topic.posts_count).to eq(2)
@@ -65,11 +65,48 @@ describe Draft do
     expect(Draft.get(user, "test", 0)).to eq nil
   end
 
+  it "should cross check with DraftSequence table" do
+
+    Draft.set(user, "test", 0, "old")
+    expect(Draft.get(user, "test", 0)).to eq "old"
+
+    DraftSequence.next!(user, "test")
+    seq = DraftSequence.next!(user, "test")
+    expect(seq).to eq(2)
+
+    expect do
+      Draft.set(user, "test", seq - 1, "error")
+    end.to raise_error(Draft::OutOfSequence)
+
+    expect do
+      Draft.set(user, "test", seq + 1, "error")
+    end.to raise_error(Draft::OutOfSequence)
+
+    Draft.set(user, "test", seq, "data")
+    expect(Draft.get(user, "test", seq)).to eq "data"
+
+    expect do
+      expect(Draft.get(user, "test", seq - 1)).to eq "data"
+    end.to raise_error(Draft::OutOfSequence)
+
+    expect do
+      expect(Draft.get(user, "test", seq + 1)).to eq "data"
+    end.to raise_error(Draft::OutOfSequence)
+  end
+
   it "should disregard old draft if sequence decreases" do
     Draft.set(user, "test", 0, "data")
+    DraftSequence.next!(user, "test")
     Draft.set(user, "test", 1, "hello")
-    Draft.set(user, "test", 0, "foo")
-    expect(Draft.get(user, "test", 0)).to eq nil
+
+    expect do
+      Draft.set(user, "test", 0, "foo")
+    end.to raise_error(Draft::OutOfSequence)
+
+    expect do
+      Draft.get(user, "test", 0)
+    end.to raise_error(Draft::OutOfSequence)
+
     expect(Draft.get(user, "test", 1)).to eq "hello"
   end
 
@@ -89,7 +126,8 @@ describe Draft do
     Draft.cleanup!
 
     expect(Draft.count).to eq 0
-    Draft.set(Fabricate(:user), Draft::NEW_TOPIC, seq + 1, 'draft')
+
+    Draft.set(Fabricate(:user), Draft::NEW_TOPIC, 0, 'draft')
 
     Draft.cleanup!
 
@@ -160,10 +198,11 @@ describe Draft do
     it 'nukes the post draft when a post is created' do
       user = Fabricate(:user)
       topic = Fabricate(:topic)
-      p = PostCreator.new(user, raw: Fabricate.build(:post).raw, topic_id: topic.id).create
-      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
 
-      PostCreator.new(user, raw: Fabricate.build(:post).raw).create
+      Draft.set(user, topic.draft_key, 0, 'hello')
+
+      p = PostCreator.new(user, raw: Fabricate.build(:post).raw, topic_id: topic.id).create
+
       expect(Draft.get(p.user, p.topic.draft_key, DraftSequence.current(p.user, p.topic.draft_key))).to eq nil
     end
 
@@ -180,7 +219,19 @@ describe Draft do
       Draft.set(u, 'new_topic', 0, 'hello')
       Draft.set(u, 'new_topic', 0, 'goodbye')
 
-      expect(Draft.find_draft(u, 'new_topic').revisions).to eq(2)
+      expect(Draft.find_by(user_id: u.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)
+
+      draft_seq = Draft.set(user, 'new_topic', 0, 'hello world', _owner = 'HIJKL')
+      expect(draft_seq).to eq(1)
+
+      draft_seq = Draft.set(user, 'new_topic', 1, 'hello world', _owner = 'HIJKL')
+      expect(draft_seq).to eq(1)
     end
   end
 end
diff --git a/spec/requests/draft_controller_spec.rb b/spec/requests/draft_controller_spec.rb
index 417f792617..161980b143 100644
--- a/spec/requests/draft_controller_spec.rb
+++ b/spec/requests/draft_controller_spec.rb
@@ -26,7 +26,6 @@ describe DraftController do
     post = Fabricate(:post, user: user)
 
     post "/draft.json", params: {
-      username: user.username,
       draft_key: "topic",
       sequence: 0,
       data: {
@@ -39,7 +38,6 @@ describe DraftController do
     expect(JSON.parse(response.body)['conflict_user']).to eq(nil)
 
     post "/draft.json", params: {
-      username: user.username,
       draft_key: "topic",
       sequence: 0,
       data: {
@@ -62,4 +60,97 @@ describe DraftController do
     expect(response.status).to eq(200)
     expect(Draft.get(user, 'xxx', 0)).to eq(nil)
   end
+
+  it 'cant trivially resolve conflicts without interaction' do
+
+    user = sign_in(Fabricate(:user))
+
+    DraftSequence.next!(user, "abc")
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: 0,
+      data: { a: "test" }.to_json,
+      owner: "abcdefg"
+    }
+
+    expect(response.status).to eq(200)
+    json = JSON.parse(response.body)
+    expect(json["draft_sequence"]).to eq(1)
+  end
+
+  it 'has a clean protocol for ownership handover' do
+    user = sign_in(Fabricate(:user))
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: 0,
+      data: { a: "test" }.to_json,
+      owner: "abcdefg"
+    }
+
+    expect(response.status).to eq(200)
+
+    json = JSON.parse(response.body)
+    expect(json["draft_sequence"]).to eq(0)
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: 0,
+      data: { b: "test" }.to_json,
+      owner: "hijklmnop"
+    }
+
+    expect(response.status).to eq(200)
+    json = JSON.parse(response.body)
+    expect(json["draft_sequence"]).to eq(1)
+
+    expect(DraftSequence.current(user, "abc")).to eq(1)
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: 1,
+      data: { c: "test" }.to_json,
+      owner: "hijklmnop"
+    }
+
+    expect(response.status).to eq(200)
+    json = JSON.parse(response.body)
+    expect(json["draft_sequence"]).to eq(1)
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: 1,
+      data: { c: "test" }.to_json,
+      owner: "abc"
+    }
+
+    expect(response.status).to eq(200)
+    json = JSON.parse(response.body)
+    expect(json["draft_sequence"]).to eq(2)
+  end
+
+  it 'raises an error for out-of-sequence draft setting' do
+
+    user = sign_in(Fabricate(:user))
+    seq = DraftSequence.next!(user, "abc")
+    Draft.set(user, "abc", seq, { b: "test" }.to_json)
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: seq - 1,
+      data: { a: "test" }.to_json
+    }
+
+    expect(response.status).to eq(409)
+
+    post "/draft.json", params: {
+      draft_key: "abc",
+      sequence: seq + 1,
+      data: { a: "test" }.to_json
+    }
+
+    expect(response.status).to eq(409)
+
+  end
 end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index ed11feb011..02f5e506f7 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -127,7 +127,7 @@ describe UserDestroyer do
     end
 
     context "with a draft" do
-      let!(:draft) { Draft.set(user, 'test', 1, 'test') }
+      let!(:draft) { Draft.set(user, 'test', 0, 'test') }
 
       it "removed the draft" do
         UserDestroyer.new(admin).destroy(user)

From f8b72d983541b33154239e0f9cc3d3a8e25c3eb3 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 31 Oct 2019 09:13:24 -0400
Subject: [PATCH 254/328] DEV: Refactor excluding audio/video URLs from search
 result blurbs

Followup to 580a4a82
---
 lib/oneboxer.rb                      | 6 ++++--
 lib/search/grouped_search_results.rb | 8 ++++++--
 spec/lib/search_spec.rb              | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 871e48c96e..c77857ad57 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -6,6 +6,8 @@ Dir["#{Rails.root}/lib/onebox/engine/*_onebox.rb"].sort.each { |f| require f }
 
 module Oneboxer
   ONEBOX_CSS_CLASS = "onebox"
+  AUDIO_REGEX = /^\.(mp3|og[ga]|opus|wav|m4[abpr]|aac|flac)$/i
+  VIDEO_REGEX = /^\.(mov|mp4|m4v|webm|ogv|3gp)$/i
 
   # keep reloaders happy
   unless defined? Oneboxer::Result
@@ -171,9 +173,9 @@ module Oneboxer
 
   def self.local_upload_html(url)
     case File.extname(URI(url).path || "")
-    when /^\.(mov|mp4|m4v|webm|ogv|3gp)$/i
+    when VIDEO_REGEX
       "<video width='100%' height='100%' controls><source src='#{url}'><a href='#{url}'>#{url}</a></video>"
-    when /^\.(mp3|og[ga]|opus|wav|m4[abpr]|aac|flac)$/i
+    when AUDIO_REGEX
       "<audio controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
     end
   end
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index eb3454c975..4a5dcccf17 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -80,8 +80,12 @@ class Search
       cooked.scan(URI.regexp(%w{http https})) { urls << $& }
 
       urls.each do |url|
-        cooked.gsub!(url, I18n.t("search.video")) if url.match(/.(mov|mp4|webm|ogv)/)
-        cooked.gsub!(url, I18n.t("search.audio")) if url.match(/.(mp3|ogg|wav|m4a)/)
+        case File.extname(URI(url).path || "")
+        when Oneboxer::VIDEO_REGEX
+          cooked.gsub!(url, I18n.t("search.video"))
+        when Oneboxer::AUDIO_REGEX
+          cooked.gsub!(url, I18n.t("search.audio"))
+        end
       end
 
       if term
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index e78f75faf4..c3aaa88130 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -22,7 +22,7 @@ describe Search do
 
         link to an audio file: https://somesite.com/content/file123.m4a
 
-        link to a video file: https://somesite.com/content/somethingelse.mov
+        link to a video file: https://somesite.com/content/somethingelse.MOV
       RAW
       result = Search::GroupedSearchResults.blurb_for(cooked)
       expect(result).to eq("link to an external page: https://google.com/?u=bar link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")}")

From 15b25547bb024f416002d15db368b6949ce5a2fa Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 31 Oct 2019 09:32:42 -0400
Subject: [PATCH 255/328] DEV: Cleanup misspelled TextHelper param

---
 lib/search/grouped_search_results.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 4a5dcccf17..88538f02ed 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -97,12 +97,11 @@ class Search
         end
 
         blurb = TextHelper.excerpt(cooked, phrase,
-          radius: blurb_length / 2,
-          seperator: " "
+          radius: blurb_length / 2
         )
       end
 
-      blurb = TextHelper.truncate(cooked, length: blurb_length, seperator: " ") if blurb.blank?
+      blurb = TextHelper.truncate(cooked, length: blurb_length) if blurb.blank?
       Sanitize.clean(blurb)
     end
   end

From 1f88ecf6d85347fdbd1114c5447947f690d0eaef Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 31 Oct 2019 15:16:26 +0000
Subject: [PATCH 256/328] FIX: Cache `Discourse.system_user` separately for
 each multisite tenant (#8276)

This was not causing any known issue, because the system user ID is always the same across all sites. However, we should cache this on a per-site basis to be safe.
---
 lib/discourse.rb                  | 4 +++-
 spec/components/discourse_spec.rb | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/discourse.rb b/lib/discourse.rb
index b7b65762fb..561a4e979f 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -536,7 +536,9 @@ module Discourse
   SYSTEM_USER_ID ||= -1
 
   def self.system_user
-    @system_user ||= User.find_by(id: SYSTEM_USER_ID)
+    @system_users ||= {}
+    current_db = RailsMultisite::ConnectionManagement.current_db
+    @system_users[current_db] ||= User.find_by(id: SYSTEM_USER_ID)
   end
 
   def self.store
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 76a832c6d0..70559a5038 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -130,6 +130,12 @@ describe Discourse do
 
   end
 
+  context '#system_user' do
+    it 'returns the system user' do
+      expect(Discourse.system_user.id).to eq(-1)
+    end
+  end
+
   context "#store" do
 
     it "returns LocalStore by default" do

From 11f50eee3bb3fdd40db1f192c2e6b7b31d961f13 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 31 Oct 2019 11:54:46 -0500
Subject: [PATCH 257/328] DEV: Remove pretty_text import hack & still work
 server-side (#8266)

* FIX: move attachment_css_class constant out of upload-short-url for discourse-markdown-it

* Use setTimeout instead of ember later

* WIP. Not sure if this worked.

* oneboxer cache in separate file

* Reset onebox cache still

* set functions for oneboxers cache
---
 app/assets/javascripts/discourse-loader.js    |  6 ----
 .../components/composer-title.js.es6          |  3 +-
 app/assets/javascripts/pretty-text-bundle.js  |  1 +
 .../engines/discourse-markdown-it.js.es6      |  3 +-
 .../engines/discourse-markdown/onebox.js.es6  |  2 +-
 .../pretty-text/oneboxer-cache.js.es6         | 29 +++++++++++++++++
 .../javascripts/pretty-text/oneboxer.js.es6   | 31 +++++++++----------
 .../pretty-text/upload-short-url.js.es6       |  3 +-
 8 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 app/assets/javascripts/pretty-text/oneboxer-cache.js.es6

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 59c3f4b62b..11bdb9d2fd 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -68,12 +68,6 @@ var define, requirejs;
         inject: Ember.inject.service
       }
     };
-  } else if (typeof __PRETTY_TEXT !== "undefined") {
-    // This is a hack because our server side code includes the pretty_text bundle
-    // which relies on ember now that we're using modules properly.
-    // The proper fix would be to move the upload urls code out of the pretty text
-    // bundle and remove this code. It should never be called;
-    EMBER_MODULES["@ember/runloop"] = {};
   }
 
   var _isArray;
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 907a4569db..556b24bda8 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -8,7 +8,8 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
-import { load, lookupCache } from "pretty-text/oneboxer";
+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";
 
diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js
index 3887f90031..c964a71cda 100644
--- a/app/assets/javascripts/pretty-text-bundle.js
+++ b/app/assets/javascripts/pretty-text-bundle.js
@@ -10,6 +10,7 @@
 //= require ./pretty-text/white-lister
 //= require ./pretty-text/sanitizer
 //= require ./pretty-text/oneboxer
+//= require ./pretty-text/oneboxer-cache
 //= require ./pretty-text/context/inline-onebox-css-classes
 //= require ./pretty-text/inline-oneboxer
 //= require ./pretty-text/upload-short-url
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.es6
index 116eadb316..7bf824de7f 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
@@ -1,7 +1,8 @@
 import { default as WhiteLister } from "pretty-text/white-lister";
 import { sanitize } from "pretty-text/sanitizer";
 import guid from "pretty-text/guid";
-import { ATTACHMENT_CSS_CLASS } from "pretty-text/upload-short-url";
+
+export const ATTACHMENT_CSS_CLASS = "attachment";
 
 function deprecate(feature, name) {
   return function() {
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.es6
index ddd4a1b178..3203110c94 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
@@ -1,4 +1,4 @@
-import { lookupCache } from "pretty-text/oneboxer";
+import { lookupCache } from "pretty-text/oneboxer-cache";
 import { cachedInlineOnebox } from "pretty-text/inline-oneboxer";
 
 import {
diff --git a/app/assets/javascripts/pretty-text/oneboxer-cache.js.es6 b/app/assets/javascripts/pretty-text/oneboxer-cache.js.es6
new file mode 100644
index 0000000000..c9a98165ce
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/oneboxer-cache.js.es6
@@ -0,0 +1,29 @@
+export let localCache = {};
+export let failedCache = {};
+
+// Sometimes jQuery will return URLs with trailing slashes when the
+// `href` didn't have them.
+export function resetLocalCache() {
+  localCache = {};
+}
+
+export function resetFailedCache() {
+  failedCache = {};
+}
+
+export function setLocalCache(key, value) {
+  localCache[key] = value;
+}
+
+export function setFailedCache(key, value) {
+  failedCache[key] = value;
+}
+
+export function normalize(url) {
+  return url.replace(/\/$/, "");
+}
+
+export function lookupCache(url) {
+  const cached = localCache[normalize(url)];
+  return cached && cached.prop("outerHTML");
+}
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index a500274a77..cb7d94b641 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -1,15 +1,23 @@
 import { later } from "@ember/runloop";
+import {
+  localCache,
+  failedCache,
+  setLocalCache,
+  setFailedCache,
+  resetLocalCache,
+  resetFailedCache,
+  normalize
+} from "pretty-text/oneboxer-cache";
+
 let timeout;
 const loadingQueue = [];
-let localCache = {};
-let failedCache = {};
 
 export const LOADING_ONEBOX_CSS_CLASS = "loading-onebox";
 
 export function resetCache() {
   loadingQueue.clear();
-  localCache = {};
-  failedCache = {};
+  resetLocalCache();
+  resetFailedCache();
 }
 
 function resolveSize(img) {
@@ -68,7 +76,7 @@ function loadNext(ajax) {
     .then(
       html => {
         let $html = $(html);
-        localCache[normalize(url)] = $html;
+        setLocalCache(normalize(url), $html);
         $elem.replaceWith($html);
         applySquareGenericOnebox($html, normalize(url));
       },
@@ -78,7 +86,7 @@ function loadNext(ajax) {
           removeLoading = false;
           loadingQueue.unshift({ url, refresh, $elem, categoryId, topicId });
         } else {
-          failedCache[normalize(url)] = true;
+          setFailedCache[normalize(url)] = true;
         }
       }
     )
@@ -133,14 +141,3 @@ export function load({
     timeout = timeout || later(() => loadNext(ajax), 150);
   }
 }
-
-// Sometimes jQuery will return URLs with trailing slashes when the
-// `href` didn't have them.
-function normalize(url) {
-  return url.replace(/\/$/, "");
-}
-
-export function lookupCache(url) {
-  const cached = localCache[normalize(url)];
-  return cached && cached.prop("outerHTML");
-}
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
index 3a2f46805c..916f899b6a 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
@@ -1,4 +1,5 @@
 import { debounce } from "@ember/runloop";
+import { ATTACHMENT_CSS_CLASS } from "./engines/discourse-markdown-it";
 let _cache = {};
 
 export function lookupCachedUploadUrl(shortUrl) {
@@ -38,8 +39,6 @@ export function resetCache() {
   _cache = {};
 }
 
-export const ATTACHMENT_CSS_CLASS = "attachment";
-
 function _loadCachedShortUrls($uploads) {
   $uploads.each((idx, upload) => {
     const $upload = $(upload);

From 4434f419c6d02d5797e4d99dd961aa7e87851bac Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 31 Oct 2019 13:06:59 -0400
Subject: [PATCH 258/328] Copy edit: rename profile header to profile
 background

---
 config/locales/client.en.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index cad4dfdf51..e3fb96f74f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -998,14 +998,14 @@ en:
           default_name: "My Authenticator"
         security_key:
           register: "Register"
-          title: 'Security Keys'
+          title: "Security Keys"
           add: "Register Security Key"
           default_name: "Main Security Key"
           not_allowed_error: "The security key registration process either timed out or was cancelled."
           already_added_error: "You have already registered this security key. You don’t have to register it again."
-          edit: 'Edit Security Key'
-          edit_description: 'Security Key Name'
-          delete: 'Delete'
+          edit: "Edit Security Key"
+          edit_description: "Security Key Name"
+          delete: "Delete"
 
       change_about:
         title: "Change About Me"
@@ -1037,8 +1037,8 @@ en:
         image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal."
 
       change_profile_background:
-        title: "Profile Background"
-        instructions: "Profile backgrounds will be centered and have a default width of 850px."
+        title: "Profile Header"
+        instructions: "Profile headers will be centered and have a default width of 1110px."
 
       change_card_background:
         title: "User Card Background"

From d84c34ad7523c6f894315dcbfc0b215dff3b3707 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 30 Oct 2019 17:22:32 +0000
Subject: [PATCH 259/328] DEV: Server-side category routing changes

The routes for categories are changing. The scheme that I intend to move
us to is:

/c/*slug_path/(:id)/ENDPOINT
/c/*slug_path/(:id)

This commit adds support for the new scheme to the server side without
dropping support for existing URLs. It is necessary to support existing
URLs for two reasons:

 * This commit does not change any client side routing code,
 * Posts that contain category hashtags that refer to a root category
   are baked into URLs that do not fit this new scheme, (/c/[id]-[slug])
---
 app/controllers/list_controller.rb    | 92 +++++++++++++--------------
 app/models/category.rb                | 10 +++
 config/routes.rb                      | 49 ++++++++------
 spec/requests/list_controller_spec.rb | 14 ++--
 4 files changed, 87 insertions(+), 78 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 681af70ec2..bba2d3c9b6 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -11,16 +11,12 @@ class ListController < ApplicationController
     # filtered topics lists
     Discourse.filters.map { |f| :"category_#{f}" },
     Discourse.filters.map { |f| :"category_none_#{f}" },
-    Discourse.filters.map { |f| :"parent_category_category_#{f}" },
-    Discourse.filters.map { |f| :"parent_category_category_none_#{f}" },
     # top summaries
     :category_top,
     :category_none_top,
-    :parent_category_category_top,
     # top pages (ie. with a period)
     TopTopic.periods.map { |p| :"category_top_#{p}" },
     TopTopic.periods.map { |p| :"category_none_top_#{p}" },
-    TopTopic.periods.map { |p| :"parent_category_category_top_#{p}" },
     # category feeds
     :category_feed,
   ].flatten
@@ -34,8 +30,6 @@ class ListController < ApplicationController
     :category_default,
     Discourse.anonymous_filters.map { |f| :"category_#{f}" },
     Discourse.anonymous_filters.map { |f| :"category_none_#{f}" },
-    Discourse.anonymous_filters.map { |f| :"parent_category_category_#{f}" },
-    Discourse.anonymous_filters.map { |f| :"parent_category_category_none_#{f}" },
     # category feeds
     :category_feed,
     # user topics feed
@@ -44,13 +38,11 @@ class ListController < ApplicationController
     :top,
     :category_top,
     :category_none_top,
-    :parent_category_category_top,
     # top pages (ie. with a period)
     TopTopic.periods.map { |p| :"top_#{p}" },
     TopTopic.periods.map { |p| :"top_#{p}_feed" },
     TopTopic.periods.map { |p| :"category_top_#{p}" },
     TopTopic.periods.map { |p| :"category_none_top_#{p}" },
-    TopTopic.periods.map { |p| :"parent_category_category_top_#{p}" },
     :group_topics
   ].flatten
 
@@ -124,15 +116,6 @@ class ListController < ApplicationController
     define_method("category_none_#{filter}") do
       self.public_send(filter, category: @category.id, no_subcategories: true)
     end
-
-    define_method("parent_category_category_#{filter}") do
-      canonical_url "#{Discourse.base_url_no_prefix}#{@category.url}"
-      self.public_send(filter, category: @category.id)
-    end
-
-    define_method("parent_category_category_none_#{filter}") do
-      self.public_send(filter, category: @category.id)
-    end
   end
 
   def category_default
@@ -257,10 +240,6 @@ class ListController < ApplicationController
     top(category: @category.id, no_subcategories: true)
   end
 
-  def parent_category_category_top
-    top(category: @category.id)
-  end
-
   TopTopic.periods.each do |period|
     define_method("top_#{period}") do |options = nil|
       top_options = build_topic_list_options
@@ -296,10 +275,6 @@ class ListController < ApplicationController
       )
     end
 
-    define_method("parent_category_category_top_#{period}") do
-      self.public_send("top_#{period}", category: @category.id)
-    end
-
     # rss feed
     define_method("top_#{period}_feed") do |options = nil|
       discourse_expires_in 1.minute
@@ -333,32 +308,42 @@ class ListController < ApplicationController
 
   def page_params
     route_params = { format: 'json' }
-    route_params[:category]        = @category.slug_for_url                  if @category
-    route_params[:parent_category] = @category.parent_category.slug_for_url  if @category && @category.parent_category
-    route_params[:username]        = UrlHelper.escape_uri(params[:username]) if params[:username].present?
+
+    if @category.present?
+      slug_path = @category.slug_path
+
+      route_params[:category_slug_path_with_id] =
+        (slug_path + [@category.id.to_s]).join("/")
+    end
+
+    route_params[:username] = UrlHelper.escape_uri(params[:username]) if params[:username].present?
     route_params
   end
 
   def set_category
-    slug_or_id = params.fetch(:category)
-    parent_slug_or_id = params[:parent_category]
-    id = params[:id].to_i
+    parts = params.require(:category_slug_path_with_id).split('/')
 
-    parent_category_id = nil
-    if parent_slug_or_id.present?
-      parent_category_id = Category.query_parent_category(parent_slug_or_id)
-      raise Discourse::NotFound.new("category not found", check_permalinks: true) if parent_category_id.blank? && !id
+    if !parts.empty? && parts.last =~ /\A\d+\Z/
+      id = parts.pop.to_i
+    end
+    slug_path = parts unless parts.empty?
+
+    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
+
+      # Legacy paths
+      if @category.nil? && parts.last =~ /\A\d+-/
+        @category = Category.find_by_id(parts.last.to_i)
+      end
     end
 
-    @category = Category.query_category(slug_or_id, parent_category_id)
+    raise Discourse::NotFound.new("category not found", check_permalinks: true) if @category.nil?
 
-    # Redirect if we have `/c/:parent_category/:category/:id`
-    if params.include?(:id)
-      category = Category.find_by_id(id)
-      (redirect_to category.url, status: 301) && return if category
-    end
-
-    raise Discourse::NotFound.new("category not found", check_permalinks: true) if !@category
+    params[:category] = @category.id.to_s
 
     @description_meta = @category.description_text
     if !guardian.can_see?(@category)
@@ -388,12 +373,21 @@ class ListController < ApplicationController
 
   def construct_url_with(action, opts, url_prefix = nil)
     method = url_prefix.blank? ? "#{action_name}_path" : "#{url_prefix}_#{action_name}_path"
-    url = if action == :prev
-      public_send(method, opts.merge(prev_page_params))
-    else # :next
-      public_send(method, opts.merge(next_page_params))
-    end
-    url.sub('.json?', '?')
+
+    page_params =
+      case action
+      when :prev
+        prev_page_params
+      when :next
+        next_page_params
+      else
+        raise "unreachable"
+      end
+
+    opts = opts.dup
+    opts.delete(:category) if page_params.include?(:category_slug_path_with_id)
+
+    public_send(method, opts.merge(page_params)).sub('.json?', '?')
   end
 
   def get_excluded_category_ids(current_category = nil)
diff --git a/app/models/category.rb b/app/models/category.rb
index ecec90e437..e692de65f9 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -808,6 +808,16 @@ class Category < ActiveRecord::Base
     end
   end
 
+  def slug_path
+    if self.parent_category_id.present?
+      slug_path = self.parent_category.slug_path
+      slug_path.push(self.slug_for_url)
+      slug_path
+    else
+      [self.slug_for_url]
+    end
+  end
+
   private
 
   def check_permissions_compatibility(parent_permissions, child_permissions)
diff --git a/config/routes.rb b/config/routes.rb
index 44594aa6ac..c00041b3e0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -620,35 +620,49 @@ Discourse::Application.routes.draw do
 
   get '/c', to: redirect(relative_url_root + 'categories')
 
-  resources :categories, except: :show
-  post "category/:category_id/move" => "categories#move"
+  resources :categories, except: [:show, :new, :edit]
   post "categories/reorder" => "categories#reorder"
-  post "category/:category_id/notifications" => "categories#set_notifications"
-  put "category/:category_id/slug" => "categories#update_slug"
+
+  scope path: 'category/:category_id' do
+    post "/move" => "categories#move"
+    post "/notifications" => "categories#set_notifications"
+    put "/slug" => "categories#update_slug"
+  end
+
+  get "category/*path" => "categories#redirect"
 
   get "categories_and_latest" => "categories#categories_and_latest"
   get "categories_and_top" => "categories#categories_and_top"
 
   get "c/:id/show" => "categories#show"
+
   get "c/:category_slug/find_by_slug" => "categories#find_by_slug"
   get "c/:parent_category_slug/:category_slug/find_by_slug" => "categories#find_by_slug"
-  get "c/:category.rss" => "list#category_feed", format: :rss
-  get "c/:parent_category/:category.rss" => "list#category_feed", format: :rss
-  get "c/:category" => "list#category_default", as: "category_default"
-  get "c/:category/none" => "list#category_none_latest"
-  get "c/:parent_category/:category/(:id)" => "list#parent_category_category_latest", constraints: { id: /\d+/ }
-  get "c/:category/l/top" => "list#category_top", as: "category_top"
-  get "c/:category/none/l/top" => "list#category_none_top", as: "category_none_top"
-  get "c/:parent_category/:category/l/top" => "list#parent_category_category_top", as: "parent_category_category_top"
+
+  get "c/*category_slug_path_with_id.rss" => "list#category_feed", format: :rss
+  scope path: 'c/*category_slug_path_with_id' do
+    get "/none" => "list#category_none_latest"
+    get "/none/l/top" => "list#category_none_top", as: "category_none_top"
+    get "/l/top" => "list#category_top", as: "category_top"
+
+    TopTopic.periods.each do |period|
+      get "/none/l/top/#{period}" => "list#category_none_top_#{period}", as: "category_none_top_#{period}"
+      get "/l/top/#{period}" => "list#category_top_#{period}", as: "category_top_#{period}"
+    end
+
+    Discourse.filters.each do |filter|
+      get "/none/l/#{filter}" => "list#category_none_#{filter}", as: "category_none_#{filter}"
+      get "/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}"
+    end
+
+    get "/" => "list#category_default", as: "category_default"
+  end
 
   get "category_hashtags/check" => "category_hashtags#check"
 
   TopTopic.periods.each do |period|
     get "top/#{period}.rss" => "list#top_#{period}_feed", format: :rss
     get "top/#{period}" => "list#top_#{period}"
-    get "c/:category/l/top/#{period}" => "list#category_top_#{period}", as: "category_top_#{period}"
-    get "c/:category/none/l/top/#{period}" => "list#category_none_top_#{period}", as: "category_none_top_#{period}"
-    get "c/:parent_category/:category/l/top/#{period}" => "list#parent_category_category_top_#{period}", as: "parent_category_category_top_#{period}"
   end
 
   Discourse.anonymous_filters.each do |filter|
@@ -657,13 +671,8 @@ Discourse::Application.routes.draw do
 
   Discourse.filters.each do |filter|
     get "#{filter}" => "list##{filter}"
-    get "c/:category/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}"
-    get "c/:category/none/l/#{filter}" => "list#category_none_#{filter}", as: "category_none_#{filter}"
-    get "c/:parent_category/:category/l/#{filter}" => "list#parent_category_category_#{filter}", as: "parent_category_category_#{filter}"
   end
 
-  get "category/*path" => "categories#redirect"
-
   get "top" => "list#top"
   get "search/query" => "search#query"
   get "search" => "search#show"
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 279acbff67..5148a6e07d 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -380,19 +380,15 @@ RSpec.describe ListController do
         let(:child_category) { Fabricate(:category_with_definition, parent_category: category) }
 
         context "with valid slug" do
-          it "redirects to the child category" do
-            get "/c/#{category.slug}/#{child_category.slug}/l/latest", params: {
-              id: child_category.id
-            }
-            expect(response).to redirect_to(child_category.url)
+          it "succeeds" do
+            get "/c/#{category.slug}/#{child_category.slug}/#{child_category.id}/l/latest"
+            expect(response.status).to eq(200)
           end
         end
 
         context "with invalid slug" do
-          it "redirects to child category" do
-            get "/c/random_slug/another_random_slug/l/latest", params: {
-              id: child_category.id
-            }
+          xit "redirects" do
+            get "/c/random_slug/another_random_slug/#{child_category.id}/l/latest"
             expect(response).to redirect_to(child_category.url)
           end
         end

From 5efa95b5f851633fb7518e40d7fbb79d09f73592 Mon Sep 17 00:00:00 2001
From: Leo McArdle <lmcardle@mozilla.com>
Date: Thu, 31 Oct 2019 19:36:24 +0000
Subject: [PATCH 260/328] FIX: make notification consent banner usable via
 keyboard and screenreader (#8255)

* update d-button to support btn-link class

* add display attribute to d-button rather than computing on class
---
 .../javascripts/discourse/components/d-button.js.es6  |  4 +++-
 .../components/notification-consent-banner.hbs        |  2 +-
 app/assets/stylesheets/common/components/buttons.scss | 11 +++++++++++
 test/javascripts/components/d-button-test.js.es6      | 11 +++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index f82df037b7..359d058d24 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -12,7 +12,7 @@ export default Component.extend({
   type: "button",
 
   tagName: "button",
-  classNameBindings: [":btn", "noText", "btnType"],
+  classNameBindings: ["btnLink::btn", "btnLink", "noText", "btnType"],
   attributeBindings: [
     "form",
     "disabled",
@@ -24,6 +24,8 @@ export default Component.extend({
 
   btnIcon: notEmpty("icon"),
 
+  btnLink: Ember.computed.equal("display", "link"),
+
   @computed("icon", "translatedLabel")
   btnType(icon, translatedLabel) {
     if (icon) {
diff --git a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
index e249c7f98f..639456d461 100644
--- a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="consent_banner alert alert-info">
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
-      {{i18n 'user.desktop_notifications.consent_prompt'}} <a {{action "turnon"}}>{{i18n 'user.desktop_notifications.enable'}}</a>.
+      {{i18n "user.desktop_notifications.consent_prompt"}} {{d-button display="link" action=(action "turnon") label="user.desktop_notifications.enable"}}.
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 018fc94bdd..0458330e00 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -275,3 +275,14 @@
     }
   }
 }
+
+.btn-link {
+  background: transparent;
+  border: 0;
+  outline: 0;
+  padding: 0;
+  color: $tertiary;
+  &:focus {
+    outline: 1px currentColor dotted;
+  }
+}
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js.es6
index 46038cd5b5..cf86842b98 100644
--- a/test/javascripts/components/d-button-test.js.es6
+++ b/test/javascripts/components/d-button-test.js.es6
@@ -43,3 +43,14 @@ componentTest("form attribute", {
     assert.ok(exists("button[form=login-form]"), "it has the form attribute");
   }
 });
+
+componentTest("link-styled button", {
+  template: '{{d-button display="link"}}',
+
+  test(assert) {
+    assert.ok(
+      find("button.btn-link:not(.btn)").length,
+      "it has the right classes"
+    );
+  }
+});

From e1679d744c7de82ff383a0df5158fee9f83b7488 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 31 Oct 2019 16:06:39 -0400
Subject: [PATCH 261/328] DEV: Add plugin outlets to advanced search options

Also adds classes for the filter containers, allowing for more granular styling.
---
 .../templates/components/search-advanced-options.hbs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 b1d80198cb..05cc82a2c3 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -1,4 +1,6 @@
-<div class="container">
+{{plugin-outlet name="advanced-search-options-above" args=(hash searchedTerms=searchedTerms) tagName=""}}
+
+<div class="container advanced-search-posted-by-group">
   <div class="control-group pull-left">
     <label class="control-label" for="search-posted-by">{{i18n "search.advanced.posted_by.label"}}</label>
     <div class="controls">
@@ -36,7 +38,7 @@
 -->
 
 {{#if siteSettings.tagging_enabled}}
-  <div class="container">
+  <div class="container advanced-search-tag-group">
     <div class="control-group">
       <label class="control-label" for="search-with-tags">{{i18n "search.advanced.with_tags.label"}}</label>
       <div class="controls">
@@ -54,7 +56,7 @@
   </div>
 {{/if}}
 
-<div class="container">
+<div class="container advanced-search-topics-posts-group">
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</label>
     <div class="controls">
@@ -77,7 +79,7 @@
   </div>
 </div>
 
-<div class="container">
+<div class="container advanced-search-date-count-group">
   <div class="control-group pull-left">
     <label class="control-label" for="search-post-date">{{i18n "search.advanced.post.time.label"}}</label>
     <div class="controls full-search-dates">
@@ -92,3 +94,5 @@
     </div>
   </div>
 </div>
+
+{{plugin-outlet name="advanced-search-options-below" args=(hash searchedTerms=searchedTerms) tagName=""}}

From 091d058ff2611c40e94359742f602c3231ff1e15 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 30 Oct 2019 11:14:14 -0400
Subject: [PATCH 262/328] UX: widen tag group name input field and add
 placeholder text

---
 app/assets/stylesheets/common/base/tagging.scss | 3 +++
 config/locales/client.en.yml                    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 3dc1f6abc4..0802a3a8f5 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -243,6 +243,9 @@ header .discourse-tag {
     .btn {
       margin-right: 10px;
     }
+    h1 input {
+      width: 100%;
+    }
   }
   .group-tags-list .tag-chooser {
     width: 100%;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e3fb96f74f..e7f5616485 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3095,6 +3095,7 @@ en:
         parent_tag_description: "Tags from this group can't be used unless the parent tag is present."
         one_per_topic_label: "Limit one tag per topic from this group"
         new_name: "New Tag Group"
+        name_placeholder: "Tag Group Name"
         save: "Save"
         delete: "Delete"
         confirm_delete: "Are you sure you want to delete this tag group?"

From d777844ed623f126ecd941d2b159f973e8e78b8d Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 30 Oct 2019 14:49:00 -0400
Subject: [PATCH 263/328] FEATURE: categories can require topics have a tag
 from a tag group

In a category's settings, the Tags tab has two new fields to
specify the number of tags that must be added to a topic
from a tag group. When creating a new topic, an error will be
shown to the user if the requirement isn't met.
---
 .../discourse/models/category.js.es6          | 11 +++++
 .../components/edit-category-tags.hbs         | 20 ++++++++
 app/assets/stylesheets/common/base/modal.scss | 16 +++++--
 app/controllers/categories_controller.rb      |  2 +
 app/models/category.rb                        |  7 +++
 app/serializers/site_category_serializer.rb   |  8 +++-
 config/locales/client.en.yml                  |  6 ++-
 config/locales/server.en.yml                  |  3 ++
 ...30_add_required_tag_group_to_categories.rb |  8 ++++
 lib/discourse_tagging.rb                      | 47 +++++++++++++++----
 lib/topic_creator.rb                          |  6 +--
 spec/components/discourse_tagging_spec.rb     | 46 ++++++++++++++++++
 spec/components/post_revisor_spec.rb          | 31 ++++++++++++
 spec/components/topic_creator_spec.rb         | 29 ++++++++++++
 spec/requests/categories_controller_spec.rb   |  7 ++-
 15 files changed, 226 insertions(+), 21 deletions(-)
 create mode 100644 db/migrate/20191030155530_add_required_tag_group_to_categories.rb

diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index ee5101074c..48f78e1ec0 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -31,6 +31,13 @@ const Category = RestModel.extend({
     }
   },
 
+  @on("init")
+  setupRequiredTagGroups() {
+    if (this.required_tag_group_name) {
+      this.set("required_tag_groups", [this.required_tag_group_name]);
+    }
+  },
+
   @computed
   availablePermissions() {
     return [
@@ -127,6 +134,10 @@ const Category = RestModel.extend({
         allowed_tags: this.allowed_tags,
         allowed_tag_groups: this.allowed_tag_groups,
         allow_global_tags: this.allow_global_tags,
+        required_tag_group_name: this.required_tag_groups
+          ? this.required_tag_groups[0]
+          : null,
+        min_tags_from_required_group: this.min_tags_from_required_group,
         sort_order: this.sort_order,
         sort_ascending: this.sort_ascending,
         topic_featured_link_allowed: this.topic_featured_link_allowed,
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 a0af5fb2fb..4d27d0c101 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
@@ -24,3 +24,23 @@
 <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>
+    {{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>
+    {{tag-group-chooser
+      id="category-required-tag-group"
+      tagGroups=category.required_tag_groups
+      maximum=1
+      filterPlaceholder="category.tag_group_selector_placeholder"
+    }}
+  </section>
+</section>
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index ced3985e74..f68600c08b 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -268,11 +268,14 @@
   section.field {
     padding: 0.25em 0;
     margin-bottom: 5px;
-  }
-
-  section.field .field-item {
-    display: inline-block;
-    margin-right: 10px;
+    &.with-items {
+      display: flex;
+      align-items: flex-start;
+    }
+    .field-item {
+      display: inline-block;
+      margin-right: 10px;
+    }
   }
 
   // password reset modal
@@ -446,6 +449,9 @@
       }
     }
   }
+  #category-min-tags-from-group {
+    width: 100px;
+  }
 }
 
 .incoming-email-modal {
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index fafa90948e..5e660f1981 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -313,6 +313,8 @@ class CategoriesController < ApplicationController
         :navigate_to_first_post_after_read,
         :search_priority,
         :allow_global_tags,
+        :required_tag_group_name,
+        :min_tags_from_required_group,
         custom_fields: [params[:custom_fields].try(:keys)],
         permissions: [*p.try(:keys)],
         allowed_tags: [],
diff --git a/app/models/category.rb b/app/models/category.rb
index e692de65f9..4e2ec97a93 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -51,6 +51,7 @@ class Category < ActiveRecord::Base
 
   validates :num_featured_topics, numericality: { only_integer: true, greater_than: 0 }
   validates :search_priority, inclusion: { in: Searchable::PRIORITIES.values }
+  validates :min_tags_from_required_group, numericality: { only_integer: true, greater_than: 0 }
 
   validate :parent_category_validator
   validate :email_in_validator
@@ -93,6 +94,8 @@ class Category < ActiveRecord::Base
   has_many :tags, through: :category_tags
   has_many :category_tag_groups, dependent: :destroy
   has_many :tag_groups, through: :category_tag_groups
+  belongs_to :required_tag_group, class_name: 'TagGroup'
+
   belongs_to :reviewable_by_group, class_name: 'Group'
 
   scope :latest, -> { order('topic_count DESC') }
@@ -555,6 +558,10 @@ class Category < ActiveRecord::Base
     self.tag_groups = TagGroup.where(name: group_names).all.to_a
   end
 
+  def required_tag_group_name=(group_name)
+    self.required_tag_group = group_name ? TagGroup.where(name: group_name).first : nil
+  end
+
   def downcase_email
     self.email_in = (email_in || "").strip.downcase.presence
   end
diff --git a/app/serializers/site_category_serializer.rb b/app/serializers/site_category_serializer.rb
index ed02fa6190..31549fd8a0 100644
--- a/app/serializers/site_category_serializer.rb
+++ b/app/serializers/site_category_serializer.rb
@@ -4,7 +4,9 @@ class SiteCategorySerializer < BasicCategorySerializer
 
   attributes :allowed_tags,
              :allowed_tag_groups,
-             :allow_global_tags
+             :allow_global_tags,
+             :min_tags_from_required_group,
+             :required_tag_group_name
 
   def include_allowed_tags?
     SiteSetting.tagging_enabled
@@ -26,4 +28,8 @@ class SiteCategorySerializer < BasicCategorySerializer
     SiteSetting.tagging_enabled
   end
 
+  def required_tag_group_name
+    object.required_tag_group&.name
+  end
+
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e7f5616485..a431052d31 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2606,10 +2606,14 @@ en:
       tags_allowed_tags: "Restrict these tags to this category:"
       tags_allowed_tag_groups: "Restrict these tag groups to this category:"
       tags_placeholder: "(Optional) list of allowed tags"
-      tags_tab_description: "Tags and tag groups specified here will only be available in this category and other categories that also specify them. They won't be available for use in other categories."
+      tags_tab_description: "Tags and tag groups specified above will only be available in this category and other categories that also specify them. They won't be available for use in other categories."
       tag_groups_placeholder: "(Optional) list of allowed tag groups"
       manage_tag_groups_link: "Manage tag groups here."
       allow_global_tags_label: "Also allow other tags"
+      tag_group_selector_placeholder: "(Optional) Tag group"
+      required_tag_group_description: "Require new topics to have tags from a tag group:"
+      min_tags_from_required_group_label: 'Num Tags:'
+      required_tag_group_label: "Tag group:"
       topic_featured_link_allowed: "Allow featured links in this category"
       delete: "Delete Category"
       create: "New Category"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 969cd73aef..b0aa559106 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4344,6 +4344,9 @@ en:
       restricted_to:
         one: '"%{tag_name}" is restricted to the "%{category_names}" category'
         other: '"%{tag_name}" is restricted to the following categories: %{category_names}'
+    required_tags_from_group:
+      one: "You must include at least %{count} %{tag_group_name} tag."
+      other: "You must include at least %{count} %{tag_group_name} tags."
   rss_by_tag: "Topics tagged %{tag}"
 
   finish_installation:
diff --git a/db/migrate/20191030155530_add_required_tag_group_to_categories.rb b/db/migrate/20191030155530_add_required_tag_group_to_categories.rb
new file mode 100644
index 0000000000..eaed95a70e
--- /dev/null
+++ b/db/migrate/20191030155530_add_required_tag_group_to_categories.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddRequiredTagGroupToCategories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :categories, :required_tag_group_id, :integer, null: true
+    add_column :categories, :min_tags_from_required_group, :integer, null: false, default: 1
+  end
+end
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index e8bb6b96ec..de6592c265 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -88,11 +88,8 @@ module DiscourseTagging
           tags = tags + Tag.where(id: missing_parent_tag_ids).all
         end
 
-        # validate minimum required tags for a category
-        if !guardian.is_staff? && category && category.minimum_required_tags > 0 && tags.length < category.minimum_required_tags
-          topic.errors.add(:base, I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
-          return false
-        end
+        return false unless validate_min_required_tags_for_category(guardian, topic, category, tags)
+        return false unless validate_required_tags_from_group(guardian, topic, category, tags)
 
         if tags.size == 0
           topic.errors.add(:base, I18n.t("tags.forbidden.invalid", count: new_tag_names.size))
@@ -101,11 +98,8 @@ module DiscourseTagging
 
         topic.tags = tags
       else
-        # validate minimum required tags for a category
-        if !guardian.is_staff? && category && category.minimum_required_tags > 0
-          topic.errors.add(:base, I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
-          return false
-        end
+        return false unless validate_min_required_tags_for_category(guardian, topic, category)
+        return false unless validate_required_tags_from_group(guardian, topic, category)
 
         topic.tags = []
       end
@@ -114,6 +108,39 @@ module DiscourseTagging
     true
   end
 
+  def self.validate_min_required_tags_for_category(guardian, topic, category, tags = [])
+    if !guardian.is_staff? &&
+        category &&
+        category.minimum_required_tags > 0 &&
+        tags.length < category.minimum_required_tags
+
+      topic.errors.add(:base, I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+      false
+    else
+      true
+    end
+  end
+
+  def self.validate_required_tags_from_group(guardian, topic, category, tags = [])
+    if !guardian.is_staff? &&
+        category &&
+        category.required_tag_group &&
+        (tags.length < category.min_tags_from_required_group ||
+          category.required_tag_group.tags.where("tags.id in (?)", tags.map(&:id)).count < category.min_tags_from_required_group)
+
+      topic.errors.add(:base,
+        I18n.t(
+          "tags.required_tags_from_group",
+          count: category.min_tags_from_required_group,
+          tag_group_name: category.required_tag_group.name
+        )
+      )
+      false
+    else
+      true
+    end
+  end
+
   # Options:
   #   term: a search term to filter tags by name
   #   category: a Category to which the object being tagged belongs
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index dfbaf74d29..5f4aa7f16e 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -147,10 +147,10 @@ class TopicCreator
   def setup_tags(topic)
     if @opts[:tags].blank?
       unless @guardian.is_staff? || !guardian.can_tag?(topic)
-        # Validate minimum required tags for a category
         category = find_category
-        if category.present? && category.minimum_required_tags > 0
-          topic.errors.add(:base, I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+
+        if !DiscourseTagging.validate_min_required_tags_for_category(@guardian, topic, category) ||
+            !DiscourseTagging.validate_required_tags_from_group(@guardian, topic, category)
           rollback_from_errors!(topic)
         end
       end
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
index d269ffd5ec..8aeb04f9ae 100644
--- a/spec/components/discourse_tagging_spec.rb
+++ b/spec/components/discourse_tagging_spec.rb
@@ -236,6 +236,52 @@ describe DiscourseTagging do
         expect(topic.reload.tags.map(&:name)).to contain_exactly(*[parent_tag, common].map(&:name))
       end
     end
+
+    context "enforces required tags from a tag group" do
+      fab!(:category) { Fabricate(:category) }
+      fab!(:tag_group) { Fabricate(:tag_group) }
+      fab!(:topic) { Fabricate(:topic, category: category) }
+
+      before do
+        tag_group.tags = [tag1, tag2]
+        category.update(
+          required_tag_group: tag_group,
+          min_tags_from_required_group: 1
+        )
+      end
+
+      it "when no tags are present" do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t("tags.required_tags_from_group", count: 1, tag_group_name: tag_group.name)
+        )
+      end
+
+      it "when tags are not part of the tag group" do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag3.name])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t("tags.required_tags_from_group", count: 1, tag_group_name: tag_group.name)
+        )
+      end
+
+      it "when requirement is met" do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name])
+        expect(valid).to eq(true)
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name, tag2.name])
+        expect(valid).to eq(true)
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag2.name, tag3.name])
+        expect(valid).to eq(true)
+      end
+
+      it "lets staff ignore the restriction" do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), [])
+        expect(valid).to eq(true)
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), [tag3.name])
+        expect(valid).to eq(true)
+      end
+    end
   end
 
   describe '#tags_for_saving' do
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 598fb686d5..8a8b284007 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -810,6 +810,37 @@ describe PostRevisor do
             end
           end
 
+          context "required tag group" do
+            fab!(:tag1) { Fabricate(:tag) }
+            fab!(:tag2) { Fabricate(:tag) }
+            fab!(:tag3) { Fabricate(:tag) }
+            fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2]) }
+            fab!(:category) { Fabricate(:category, name: "beta", required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+            before do
+              post.topic.update(category: category)
+            end
+
+            it "doesn't allow removing all tags from the group" do
+              post.topic.tags = [tag1, tag2]
+              result = subject.revise!(user, raw: "lets totally update the body", tags: [])
+              expect(result).to eq(false)
+            end
+
+            it "allows removing some tags" do
+              post.topic.tags = [tag1, tag2, tag3]
+              result = subject.revise!(user, raw: "lets totally update the body", tags: [tag1.name])
+              expect(result).to eq(true)
+              expect(post.reload.topic.tags.map(&:name)).to eq([tag1.name])
+            end
+
+            it "allows admins to remove the tags" do
+              post.topic.tags = [tag1, tag2, tag3]
+              result = subject.revise!(admin, raw: "lets totally update the body", tags: [])
+              expect(result).to eq(true)
+              expect(post.reload.topic.tags.size).to eq(0)
+            end
+          end
         end
 
         context "cannot create tags" do
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 347719adf8..c475a08e92 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -126,6 +126,35 @@ describe TopicCreator do
           expect(topic).to be_valid
         end
       end
+
+      context 'required tag group' do
+        fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1]) }
+        fab!(:category) { Fabricate(:category, name: "beta", required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+        it "when no tags are not present" do
+          expect do
+            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id))
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it "when tags are not part of the tag group" do
+          expect do
+            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: ['nope']))
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it "when requirement is met" do
+          topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: [tag1.name, tag2.name]))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(2)
+        end
+
+        it "lets staff ignore the restriction" do
+          topic = TopicCreator.create(user, Guardian.new(admin), valid_attrs.merge(category: category.id))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(0)
+        end
+      end
     end
 
     context 'personal message' do
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 36072d01f2..cb1c4d9b08 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -349,6 +349,7 @@ describe CategoriesController do
         it "updates attributes correctly" do
           readonly = CategoryGroup.permission_types[:readonly]
           create_post = CategoryGroup.permission_types[:create_post]
+          tag_group = Fabricate(:tag_group)
 
           put "/categories/#{category.id}.json", params: {
             name: "hello",
@@ -364,7 +365,9 @@ describe CategoriesController do
               "dancing" => "frogs"
             },
             minimum_required_tags: "",
-            allow_global_tags: 'true'
+            allow_global_tags: 'true',
+            required_tag_group_name: tag_group.name,
+            min_tags_from_required_group: 2
           }
 
           expect(response.status).to eq(200)
@@ -379,6 +382,8 @@ describe CategoriesController do
           expect(category.custom_fields).to eq("dancing" => "frogs")
           expect(category.minimum_required_tags).to eq(0)
           expect(category.allow_global_tags).to eq(true)
+          expect(category.required_tag_group_id).to eq(tag_group.id)
+          expect(category.min_tags_from_required_group).to eq(2)
         end
 
         it 'logs the changes correctly' do

From 5a0d30105f12fa7289200a654f9e3c7a73ac3b3d Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 31 Oct 2019 15:44:20 -0500
Subject: [PATCH 264/328] FIX: Enter key on forms submits rather than refresh
 (#8274)

Both for forgot password form, and confirm password for second factor
---
 .../javascripts/discourse/templates/modal/forgot-password.hbs   | 2 +-
 .../discourse/templates/preferences-second-factor.hbs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index bd558cb03d..473fbd9e38 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,4 +1,4 @@
-<form>
+<form {{action "resetPassword" on="submit"}}>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#unless offerHelp}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 65100cf226..e043dcbaf5 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,6 +1,6 @@
 <section class='user-preferences solo-preference second-factor'>
   {{#conditional-loading-spinner condition=loading}}
-  <form class="form-horizontal">
+  <form class="form-horizontal" {{action "confirmPassword" on="submit"}}>
 
     {{#if showEnforcedNotice}}
       <div class="control-group">

From b93f253486c8aacffbf747bcbca19a660be5419a Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 1 Nov 2019 08:22:21 +1100
Subject: [PATCH 265/328] FIX: Hide muted subcategories for mobile (#8273)

That bug was mentioned in [meta](https://meta.discourse.org/t/muting-categories-hides-them-muting-subcategories-should-too/131316)

Fix was done in that PR https://github.com/discourse/discourse/pull/8239
however I forgot about mobile template
---
 .../discourse/templates/mobile/components/categories-only.hbs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 fda2b84c03..5f9c863f99 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -28,7 +28,9 @@
               <td>
                 <div class='subcategories'>
                   {{#each c.subcategories as |subcategory|}}
-                    {{category-link subcategory}}
+                    {{#unless subcategory.isMuted}}
+                      {{category-link subcategory}}
+                    {{/unless}}
                   {{/each}}
                 </div>
               </td>

From f753643cb10d7eeacc49ba204b95caa6edaa1a8b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 1 Nov 2019 09:19:43 +1000
Subject: [PATCH 266/328] FIX: Unread topics not clearing when whisper is last
 post (#8271)

Meta thread: https://meta.discourse.org/t/cant-dismiss-unread-if-last-post-is-an-assign-or-whisper/131823/7

* when sending a whisper, the highest_staff_post_number is set
in the next_post_number method for a Topic, but the
highest_post_number is left alone. this leaves a situation
where highest_staff_post_number is > highest_post_number
* when TopicsBulkAction#dismiss_posts was run, it was only setting the topic_user
highest_seen_post_number using the highest_post_number from the topic, so if
the user was staff and the last post in a topic was a whisper
their highest seen number was not set, and the topic stayed unread

Found through testing that the bug wasn't to do with Assign/Unassign as they do not affect the post numbers, only whispering does.
---
 lib/topics_bulk_action.rb                  |  3 ++-
 spec/components/topics_bulk_action_spec.rb | 26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index a26dc0eb0a..5c45a01c9b 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -68,9 +68,10 @@ class TopicsBulkAction
   end
 
   def dismiss_posts
+    highest_number_source_column = @user.staff? ? 'highest_staff_post_number' : 'highest_post_number'
     sql = <<~SQL
       UPDATE topic_users tu
-      SET highest_seen_post_number = t.highest_post_number , last_read_post_number = highest_post_number
+      SET highest_seen_post_number = t.#{highest_number_source_column} , last_read_post_number = t.#{highest_number_source_column}
       FROM topics t
       WHERE t.id = tu.topic_id AND tu.user_id = :user_id AND t.id IN (:topic_ids)
     SQL
diff --git a/spec/components/topics_bulk_action_spec.rb b/spec/components/topics_bulk_action_spec.rb
index b0788c8b78..58cc96283c 100644
--- a/spec/components/topics_bulk_action_spec.rb
+++ b/spec/components/topics_bulk_action_spec.rb
@@ -20,6 +20,32 @@ describe TopicsBulkAction do
       expect(tu.last_read_post_number).to eq(3)
       expect(tu.highest_seen_post_number).to eq(3)
     end
+
+    context "when the user is staff" do
+      fab!(:user) { Fabricate(:admin) }
+
+      context "when the highest_staff_post_number is > highest_post_number for a topic (e.g. whisper is last post)" do
+        it "dismisses posts" do
+          post1 = create_post(user: user)
+          p = create_post(topic_id: post1.topic_id)
+          create_post(topic_id: post1.topic_id)
+
+          whisper = PostCreator.new(
+            user,
+            topic_id: post1.topic.id,
+            post_type: Post.types[:whisper],
+            raw: 'this is a whispered reply'
+          ).create
+
+          TopicsBulkAction.new(user, [post1.topic_id], type: 'dismiss_posts').perform!
+
+          tu = TopicUser.find_by(user_id: user.id, topic_id: post1.topic_id)
+
+          expect(tu.last_read_post_number).to eq(4)
+          expect(tu.highest_seen_post_number).to eq(4)
+        end
+      end
+    end
   end
 
   describe "invalid operation" do

From 70c6831125e30e31d946b47c27bfa74e5261cf5f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 1 Nov 2019 11:21:57 +1100
Subject: [PATCH 267/328] PERF: add a filtered index for banners

This ensures we can very quickly figure out which topics are banners if
a banner is set.

Previously you would have to scan an entire table to find banners
---
 app/models/draft.rb                                     | 1 +
 app/models/topic.rb                                     | 1 +
 db/migrate/20191101001705_add_banner_index_to_topics.rb | 7 +++++++
 3 files changed, 9 insertions(+)
 create mode 100644 db/migrate/20191101001705_add_banner_index_to_topics.rb

diff --git a/app/models/draft.rb b/app/models/draft.rb
index 610b8ef26d..2bbc3bcaf6 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -278,6 +278,7 @@ end
 #  updated_at :datetime         not null
 #  sequence   :integer          default(0), not null
 #  revisions  :integer          default(1), not null
+#  owner      :string
 #
 # Indexes
 #
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 85cff4f7e3..1af8598d2d 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1544,6 +1544,7 @@ end
 #  index_topics_on_bumped_at               (bumped_at)
 #  index_topics_on_created_at_and_visible  (created_at,visible) WHERE ((deleted_at IS NULL) AND ((archetype)::text <> 'private_message'::text))
 #  index_topics_on_id_and_deleted_at       (id,deleted_at)
+#  index_topics_on_id_filtered_banner      (id) UNIQUE WHERE (((archetype)::text = 'banner'::text) AND (deleted_at IS NULL))
 #  index_topics_on_lower_title             (lower((title)::text))
 #  index_topics_on_pinned_at               (pinned_at) WHERE (pinned_at IS NOT NULL)
 #  index_topics_on_pinned_globally         (pinned_globally) WHERE pinned_globally
diff --git a/db/migrate/20191101001705_add_banner_index_to_topics.rb b/db/migrate/20191101001705_add_banner_index_to_topics.rb
new file mode 100644
index 0000000000..ecafad00de
--- /dev/null
+++ b/db/migrate/20191101001705_add_banner_index_to_topics.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddBannerIndexToTopics < ActiveRecord::Migration[6.0]
+  def change
+    # this speeds up the process for finding banners on the site
+    add_index :topics, [:id], name: 'index_topics_on_id_filtered_banner', where: "archetype = 'banner' AND deleted_at IS NULL", unique: true
+  end
+end

From 9fb09d147df160cc88385893d7e61dcb85209e4f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 1 Nov 2019 13:52:25 +1100
Subject: [PATCH 268/328] DEV: allow positioning of nav items and allow
 selection

Previously we could not place extra nav items in a particular order.

This change introduces a new `before` attribute to addNavigationBarItem
with this attribute we can place a nav item before "top" or any other place.


Additionally this allows navigation items to force active state. In some
cases we may want an items that is simply a "filter" on latest using `?query_params`
when we do that we can "force" the filter active.

A concrete example is the assign plugin that adds a nav item for

Unassigned => `/c/cat-slug/l/latest?assigned=nobody&status=open`

If we did not force then latest would be selected even though the filter
is clicked.
---
 .../components/navigation-item.js.es6         |  7 ++--
 .../discourse/lib/plugin-api.js.es6           | 14 ++++++--
 .../discourse/models/nav-item.js.es6          | 32 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index a3403573fd..6d55112a94 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -15,8 +15,11 @@ export default Component.extend(
     hidden: false,
     rerenderTriggers: ["content.count"],
 
-    @computed("content.filterMode", "filterMode")
-    active(contentFilterMode, filterMode) {
+    @computed("content.filterMode", "filterMode", "content.active")
+    active(contentFilterMode, filterMode, active) {
+      if (active !== undefined) {
+        return active;
+      }
       return (
         contentFilterMode === filterMode ||
         filterMode.indexOf(contentFilterMode) === 0
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 246470af8c..26e6d16ef2 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -46,7 +46,7 @@ import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.34";
+const PLUGIN_API_VERSION = "0.8.35";
 
 class PluginApi {
   constructor(version, container) {
@@ -736,7 +736,9 @@ class PluginApi {
    *   displayName: "bugs"
    *   href: "/c/bugs",
    *   customFilter: (category, args, router) => { category && category.name !== 'bug' }
-   *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') "/a-feature"; }
+   *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') "/a-feature"; },
+   *   before: "top",
+   *   forceActive(category, args, router) => router.currentURL === "/a/b/c/d";
    * })
    */
   addNavigationBarItem(item) {
@@ -763,6 +765,14 @@ class PluginApi {
         };
       }
 
+      const forceActive = item.forceActive;
+      if (forceActive) {
+        const router = this.container.lookup("service:router");
+        item.forceActive = function(category, args) {
+          return forceActive(category, args, router);
+        };
+      }
+
       addNavItem(item);
     }
   }
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index 85379d4bfc..f03a5fc131 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -193,12 +193,42 @@ NavItem.reopenClass({
       return item.customFilter.call(this, category, args);
     });
 
+    let forceActive = false;
+
     extraItems.forEach(item => {
+      const before = item.before;
+      if (before) {
+        let i = 0;
+        for (i = 0; i < items.length; i++) {
+          if (items[i].name === before) {
+            break;
+          }
+        }
+        items.splice(i, 0, item);
+      } else {
+        items.push(item);
+      }
+
       if (!item.customHref) return;
+
       item.set("href", item.customHref.call(this, category, args));
+
+      if (item.forceActive && item.forceActive.call(this, category, args)) {
+        item.active = true;
+        forceActive = true;
+      } else {
+        item.active = undefined;
+      }
     });
 
-    return items.concat(extraItems);
+    if (forceActive) {
+      items.forEach(i => {
+        if (i.active === undefined) {
+          i.active = false;
+        }
+      });
+    }
+    return items;
   }
 });
 

From 25a3bd333eb953f99078a5d72d9618fbdcf9315f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 1 Nov 2019 15:40:00 +1100
Subject: [PATCH 269/328] DEV: correct fragile test

This test would fail sometimes if for some reason topic id 1 was in the db

No reason to pretend here, this only makes for a fragile test suite.
---
 spec/components/cooked_post_processor_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 5888433f63..174c8b0ef5 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -301,7 +301,7 @@ describe CookedPostProcessor do
           )
 
           # Fake a loading image
-          optimized_image = OptimizedImage.create!(
+          _optimized_image = OptimizedImage.create!(
             url: '/uploads/default/10x10.png',
             width: CookedPostProcessor::LOADING_SIZE,
             height: CookedPostProcessor::LOADING_SIZE,
@@ -629,8 +629,7 @@ describe CookedPostProcessor do
       end
 
       context "topic image" do
-        let(:topic) { build(:topic, id: 1) }
-        let(:post) { Fabricate(:post_with_uploaded_image, topic: topic) }
+        let(:post) { Fabricate(:post_with_uploaded_image) }
         let(:cpp) { CookedPostProcessor.new(post) }
 
         it "adds a topic image if there's one in the first post" do

From 72aa26c8c55b75e16fc11c32bc728f510f7c200d Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 1 Nov 2019 12:40:13 +0530
Subject: [PATCH 270/328] FEATURE: New site settings for default tags in user
 preferences. (#8283)

---
 .../admin/components/site-setting.js.es6      |  4 ++
 .../components/site-settings/tag-list.js.es6  | 15 ++++++
 .../admin/mixins/setting-component.js.es6     |  3 +-
 .../components/site-settings/tag-list.hbs     |  3 ++
 .../admin/site_settings_controller.rb         | 29 ++++++++++-
 app/models/user.rb                            | 18 +++++++
 config/locales/server.en.yml                  |  6 +++
 config/site_settings.yml                      | 13 +++++
 lib/site_settings/type_supervisor.rb          |  1 +
 lib/site_settings/validations.rb              | 52 +++++++++++++++++++
 spec/models/user_spec.rb                      | 10 ++++
 .../admin/site_settings_controller_spec.rb    | 38 ++++++++++++++
 12 files changed, 190 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/admin/components/site-settings/tag-list.js.es6
 create mode 100644 app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 0289f4cdf4..90c886c3a6 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -40,6 +40,10 @@ export default Component.extend(BufferedContent, SettingComponent, {
         "default_categories_tracking",
         "default_categories_muted",
         "default_categories_watching_first_post",
+        "default_tags_watching",
+        "default_tags_tracking",
+        "default_tags_muted",
+        "default_tags_watching_first_post",
         "default_text_size",
         "default_title_count_mode"
       ];
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.es6
new file mode 100644
index 0000000000..417ad622cb
--- /dev/null
+++ b/app/assets/javascripts/admin/components/site-settings/tag-list.js.es6
@@ -0,0 +1,15 @@
+import Component from "@ember/component";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Component.extend({
+  @computed("value")
+  selectedTags: {
+    get(value) {
+      return value.split("|");
+    },
+    set(value) {
+      this.set("value", value.join("|"));
+      return value;
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 409c1b3359..3a7ab2e2c4 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -17,7 +17,8 @@ const CUSTOM_TYPES = [
   "compact_list",
   "secret_list",
   "upload",
-  "group_list"
+  "group_list",
+  "tag_list"
 ];
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
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
new file mode 100644
index 0000000000..84c6623cfb
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -0,0 +1,3 @@
+{{tag-chooser tags=selectedTags}}
+<div class='desc'>{{{unbound setting.description}}}</div>
+{{setting-validation-message message=validationMessage}}
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index fdc6179187..689b7bdc43 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -92,8 +92,35 @@ class Admin::SiteSettingsController < Admin::AdminController
             users.each { |user| category_users << { category_id: category_id, user_id: user.id, notification_level: notification_level } }
             CategoryUser.insert_all!(category_users)
           end
+        end
+      elsif id.start_with?("default_tags_")
+        previous_tag_ids = Tag.where(name: previous_value.split("|")).pluck(:id)
+        new_tag_ids = Tag.where(name: new_value.split("|")).pluck(:id)
+        now = Time.zone.now
 
-          CategoryUser.where(category_id: category_id, notification_level: notification_level).first_or_create!(notification_level: notification_level)
+        case id
+        when "default_tags_watching"
+          notification_level = NotificationLevels.all[:watching]
+        when "default_tags_tracking"
+          notification_level = NotificationLevels.all[:tracking]
+        when "default_tags_muted"
+          notification_level = NotificationLevels.all[:muted]
+        when "default_tags_watching_first_post"
+          notification_level = NotificationLevels.all[:watching_first_post]
+        end
+
+        (previous_tag_ids - new_tag_ids).each do |tag_id|
+          TagUser.where(tag_id: tag_id, notification_level: notification_level).delete_all
+        end
+
+        (new_tag_ids - previous_tag_ids).each do |tag_id|
+          skip_user_ids = TagUser.where(tag_id: tag_id).pluck(:user_id)
+
+          User.where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
+            tag_users = []
+            users.each { |user| tag_users << { tag_id: tag_id, user_id: user.id, notification_level: notification_level, created_at: now, updated_at: now } }
+            TagUser.insert_all!(tag_users)
+          end
         end
       end
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index 0249ca5d0f..aa5ac937a0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,6 +117,7 @@ class User < ActiveRecord::Base
   after_create :set_random_avatar
   after_create :ensure_in_trust_level_group
   after_create :set_default_categories_preferences
+  after_create :set_default_tags_preferences
 
   after_update :trigger_user_updated_event, if: :saved_change_to_uploaded_avatar_id?
   after_update :trigger_user_automatic_group_refresh, if: :saved_change_to_staged?
@@ -1419,6 +1420,23 @@ class User < ActiveRecord::Base
     end
   end
 
+  def set_default_tags_preferences
+    return if self.staged?
+
+    values = []
+
+    %w{watching watching_first_post tracking muted}.each do |s|
+      tag_names = SiteSetting.get("default_tags_#{s}").split("|")
+      now = Time.zone.now
+
+      Tag.where(name: tag_names).pluck(:id).each do |tag_id|
+        values << { user_id: self.id, tag_id: tag_id, notification_level: TagUser.notification_levels[s.to_sym], created_at: now, updated_at: now }
+      end
+    end
+
+    TagUser.insert_all!(values) if values.present?
+  end
+
   def self.purge_unactivated
     return [] if SiteSetting.purge_unactivated_users_grace_period_days <= 0
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b0aa559106..c7e926513a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -198,6 +198,7 @@ en:
         one: "You specified the invalid choice %{name}"
         other: "You specified the invalid choices %{name}"
       default_categories_already_selected: "You cannot select a category used in another list."
+      default_tags_already_selected: "You cannot select a tag used in another list."
       s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'."
       enable_s3_uploads_is_required: "You cannot enable inventory to S3 unless you've enabled the S3 uploads."
       s3_backup_requires_s3_settings: "You cannot use S3 as backup location unless you've provided the '%{setting_name}'."
@@ -2065,6 +2066,11 @@ en:
     default_categories_muted: "List of categories that are muted by default."
     default_categories_watching_first_post: "List of categories in which first post in each new topic will be watched by default."
 
+    default_tags_watching: "List of tags that are watched by default."
+    default_tags_tracking: "List of tags that are tracked by default."
+    default_tags_muted: "List of tags that are muted by default."
+    default_tags_watching_first_post: "List of tags in which first post in each new topic will be watched by default."
+
     default_text_size: "Text size which is selected by default"
 
     default_title_count_mode: "Default mode for the page title counter"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e6c1e16770..a70e811b79 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2023,6 +2023,19 @@ user_preferences:
     type: category_list
     default: ""
 
+  default_tags_watching:
+    type: tag_list
+    default: ""
+  default_tags_tracking:
+    type: tag_list
+    default: ""
+  default_tags_muted:
+    type: tag_list
+    default: ""
+  default_tags_watching_first_post:
+    type: tag_list
+    default: ""
+
   default_text_size:
     type: enum
     default: normal
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 0f96b37908..420c64f60b 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -33,6 +33,7 @@ class SiteSettings::TypeSupervisor
       upload: 18,
       group: 19,
       group_list: 20,
+      tag_list: 21,
     )
   end
 
diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index b8323e6121..be622022c7 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -65,6 +65,58 @@ module SiteSettings::Validations
     validate_default_categories(category_ids, default_categories_selected)
   end
 
+  def validate_default_tags(tag_names, default_tags_selected)
+    validate_error :default_tags_already_selected if (tag_names & default_tags_selected).size > 0
+  end
+
+  def validate_default_tags_watching(new_val)
+    tag_names = new_val.split('|').to_set
+
+    default_tags_selected = [
+      SiteSetting.default_tags_tracking.split("|"),
+      SiteSetting.default_tags_muted.split("|"),
+      SiteSetting.default_tags_watching_first_post.split("|")
+    ].flatten.to_set
+
+    validate_default_tags(tag_names, default_tags_selected)
+  end
+
+  def validate_default_tags_tracking(new_val)
+    tag_names = new_val.split('|').to_set
+
+    default_tags_selected = [
+      SiteSetting.default_tags_watching.split("|"),
+      SiteSetting.default_tags_muted.split("|"),
+      SiteSetting.default_tags_watching_first_post.split("|")
+    ].flatten.to_set
+
+    validate_default_tags(tag_names, default_tags_selected)
+  end
+
+  def validate_default_tags_muted(new_val)
+    tag_names = new_val.split('|').to_set
+
+    default_tags_selected = [
+      SiteSetting.default_tags_watching.split("|"),
+      SiteSetting.default_tags_tracking.split("|"),
+      SiteSetting.default_tags_watching_first_post.split("|")
+    ].flatten.to_set
+
+    validate_default_tags(tag_names, default_tags_selected)
+  end
+
+  def validate_default_tags_watching_first_post(new_val)
+    tag_names = new_val.split('|').to_set
+
+    default_tags_selected = [
+      SiteSetting.default_tags_watching.split("|"),
+      SiteSetting.default_tags_tracking.split("|"),
+      SiteSetting.default_tags_muted.split("|")
+    ].flatten.to_set
+
+    validate_default_tags(tag_names, default_tags_selected)
+  end
+
   def validate_enable_s3_uploads(new_val)
     validate_error :s3_upload_bucket_is_required if new_val == "t" && SiteSetting.s3_upload_bucket.blank?
   end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8055ad48a0..567f94f6df 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -159,6 +159,16 @@ describe User do
     end
   end
 
+  context '.set_default_tags_preferences' do
+    let(:tag) { Fabricate(:tag) }
+
+    it "should set default tag preferences when new user created" do
+      SiteSetting.default_tags_watching = tag.name
+      user = Fabricate(:user)
+      expect(TagUser.exists?(tag_id: tag.id, user_id: user.id, notification_level: TagUser.notification_levels[:watching])).to be_truthy
+    end
+  end
+
   describe 'reviewable' do
     let(:user) { Fabricate(:user, active: false) }
     fab!(:admin) { Fabricate(:admin) }
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 7e035d7b7a..166df37b40 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -125,6 +125,44 @@ describe Admin::SiteSettingsController do
         end
       end
 
+      describe 'default tags' do
+        let(:user1) { Fabricate(:user) }
+        let(:user2) { Fabricate(:user) }
+        let(:watching) { NotificationLevels.all[:watching] }
+        let(:tracking) { NotificationLevels.all[:tracking] }
+
+        let(:tags) { 3.times.collect { Fabricate(:tag) } }
+
+        before do
+          SiteSetting.setting(:default_tags_watching, tags.first(2).pluck(:name).join("|"))
+          TagUser.create!(tag_id: tags.last.id, notification_level: tracking, user: user2)
+        end
+
+        after do
+          SiteSetting.setting(:default_tags_watching, "")
+        end
+
+        it 'should update existing users user preference' do
+          put "/admin/site_settings/default_tags_watching.json", params: {
+            default_tags_watching: tags.last(2).pluck(:name).join("|"),
+            updateExistingUsers: true
+          }
+
+          expect(TagUser.where(tag_id: tags.first.id, notification_level: watching).count).to eq(0)
+          expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(User.count - 1)
+        end
+
+        it 'should not update existing users user preference' do
+          expect {
+            put "/admin/site_settings/default_tags_watching.json", params: {
+              default_tags_watching: tags.last(2).pluck(:name).join("|")
+            }
+          }.to change { TagUser.where(tag_id: tags.first.id, notification_level: watching).count }.by(0)
+
+          expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(0)
+        end
+      end
+
       describe 'upload site settings' do
         it 'can remove the site setting' do
           SiteSetting.test_upload = Fabricate(:upload)

From 4312bbe1e7ce627c997920f7731f6a276d6c8291 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 1 Nov 2019 09:50:31 +0000
Subject: [PATCH 271/328] FIX: Do not load plugin CSS/JS assets when disabled
 (#8275)

Follow-up to 839916aa4901ab62fb84bcaf7d91c4354091f506 and 5bd6b70d985e2736f56d2bec6cce56bee0227b1f
---
 lib/discourse.rb                  |  2 +-
 spec/components/discourse_spec.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 561a4e979f..759a01a935 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -216,7 +216,7 @@ module Discourse
     plugins.select do |plugin|
       next if args[:include_official] == false && plugin.metadata.official?
       next if args[:include_unofficial] == false && !plugin.metadata.official?
-      next if args[:include_disabled] == false && !plugin.enabled?
+      next if !args[:include_disabled] && !plugin.enabled?
 
       true
     end
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 70559a5038..705195d53c 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -65,6 +65,33 @@ describe Discourse do
     end
   end
 
+  context 'plugins' do
+    let(:plugin_class) do
+      Class.new(Plugin::Instance) do
+        attr_accessor :enabled
+        def enabled?
+          @enabled
+        end
+      end
+    end
+
+    let(:plugin1) { plugin_class.new.tap { |p| p.enabled = true } }
+    let(:plugin2) { plugin_class.new.tap { |p| p.enabled = false } }
+
+    before { Discourse.plugins.append(plugin1, plugin2) }
+    after { Discourse.plugins.clear }
+
+    it 'can find plugins correctly' do
+      expect(Discourse.plugins).to contain_exactly(plugin1, plugin2)
+
+      # Exclude disabled plugins by default
+      expect(Discourse.find_plugins({})).to contain_exactly(plugin1)
+
+      # Include disabled plugins when requested
+      expect(Discourse.find_plugins(include_disabled: true)).to contain_exactly(plugin1, plugin2)
+    end
+  end
+
   context 'authenticators' do
     it 'returns inbuilt authenticators' do
       expect(Discourse.authenticators).to match_array(Discourse::BUILTIN_AUTH.map(&:authenticator))

From b6d2b78a6b534da82a42b531e815bb4ae60b1a14 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 1 Nov 2019 10:39:33 +0000
Subject: [PATCH 272/328] DEV: More prefabrication

---
 spec/requests/tags_controller_spec.rb | 50 +++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 5d44da4e45..358c1f9937 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -3,6 +3,14 @@
 require 'rails_helper'
 
 describe TagsController do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:regular_user) { Fabricate(:trust_level_4) }
+  fab!(:moderator) { Fabricate(:moderator) }
+
+  fab!(:category)  { Fabricate(:category) }
+  fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
+
   before do
     SiteSetting.tagging_enabled = true
   end
@@ -39,7 +47,7 @@ describe TagsController do
     context "when user can admin tags" do
 
       it "succesfully retrieve all tags" do
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
 
         get "/tags.json"
 
@@ -53,9 +61,7 @@ describe TagsController do
   end
 
   describe '#show' do
-    before do
-      Fabricate(:tag, name: 'test')
-    end
+    fab!(:tag) { Fabricate(:tag, name: 'test') }
 
     it "should return the right response" do
       get "/tags/test"
@@ -73,7 +79,7 @@ describe TagsController do
       get "/tags/test"
       expect(response.status).to eq(404)
 
-      sign_in(Fabricate(:admin))
+      sign_in(admin)
 
       get "/tags/test"
       expect(response.status).to eq(200)
@@ -81,21 +87,20 @@ describe TagsController do
   end
 
   describe '#check_hashtag' do
-    fab!(:tag) { Fabricate(:tag, name: 'test') }
+    fab!(:tag) { Fabricate(:tag) }
 
     it "should return the right response" do
       get "/tags/check.json", params: { tag_values: [tag.name] }
 
       expect(response.status).to eq(200)
 
-      tag = JSON.parse(response.body)["valid"].first
-      expect(tag["value"]).to eq('test')
+      response_tag = JSON.parse(response.body)["valid"].first
+      expect(response_tag["value"]).to eq(tag.name)
     end
   end
 
   describe "#update" do
     fab!(:tag) { Fabricate(:tag) }
-    fab!(:admin) { Fabricate(:admin) }
 
     before do
       tag
@@ -117,10 +122,7 @@ describe TagsController do
   end
 
   describe '#personal_messages' do
-    fab!(:regular_user) { Fabricate(:trust_level_4) }
-    fab!(:moderator) { Fabricate(:moderator) }
-    fab!(:admin) { Fabricate(:admin) }
-    let(:personal_message) do
+    fab!(:personal_message) do
       Fabricate(:private_message_topic, user: regular_user, topic_allowed_users: [
         Fabricate.build(:topic_allowed_user, user: regular_user),
         Fabricate.build(:topic_allowed_user, user: moderator),
@@ -128,9 +130,10 @@ describe TagsController do
       ])
     end
 
+    fab!(:tag) { Fabricate(:tag, topics: [personal_message], name: 'test') }
+
     before do
       SiteSetting.allow_staff_to_tag_pms = true
-      Fabricate(:tag, topics: [personal_message], name: 'test')
     end
 
     context "as a regular user" do
@@ -191,12 +194,10 @@ describe TagsController do
     fab!(:tag)       { Fabricate(:tag) }
     fab!(:other_tag) { Fabricate(:tag) }
     fab!(:third_tag) { Fabricate(:tag) }
-    fab!(:category)  { Fabricate(:category) }
-    fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
 
     fab!(:single_tag_topic) { Fabricate(:topic, tags: [tag]) }
-    let(:multi_tag_topic)  { Fabricate(:topic, tags: [tag, other_tag]) }
-    let(:all_tag_topic)    { Fabricate(:topic, tags: [tag, other_tag, third_tag]) }
+    fab!(:multi_tag_topic)  { Fabricate(:topic, tags: [tag, other_tag]) }
+    fab!(:all_tag_topic)    { Fabricate(:topic, tags: [tag, other_tag, third_tag]) }
 
     context 'tagging disabled' do
       it "returns 404" do
@@ -292,7 +293,6 @@ describe TagsController do
       end
 
       context "when logged in" do
-        fab!(:user) { Fabricate(:user) }
 
         before do
           sign_in(user)
@@ -442,7 +442,7 @@ describe TagsController do
   describe '#destroy' do
     context 'tagging enabled' do
       before do
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
       end
 
       context 'with an existent tag name' do
@@ -467,7 +467,7 @@ describe TagsController do
 
   describe '#unused' do
     it "fails if you can't manage tags" do
-      sign_in(Fabricate(:user))
+      sign_in(user)
       get "/tags/unused.json"
       expect(response.status).to eq(403)
       delete "/tags/unused.json"
@@ -476,7 +476,7 @@ describe TagsController do
 
     context 'logged in' do
       before do
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
       end
 
       context 'with some tags' do
@@ -525,13 +525,13 @@ describe TagsController do
       let(:filename) { 'tags.csv' }
 
       it "fails if you can't manage tags" do
-        sign_in(Fabricate(:user))
+        sign_in(user)
         post "/tags/upload.json", params: { file: file, name: filename }
         expect(response.status).to eq(403)
       end
 
       it "allows staff to bulk upload tags" do
-        sign_in(Fabricate(:moderator))
+        sign_in(moderator)
         post "/tags/upload.json", params: { file: file, name: filename }
         expect(response.status).to eq(200)
         expect(Tag.pluck(:name)).to contain_exactly("tag1", "capitaltag2", "spaced-tag", "tag3", "tag4")
@@ -540,7 +540,7 @@ describe TagsController do
       end
 
       it "fails gracefully with invalid input" do
-        sign_in(Fabricate(:moderator))
+        sign_in(moderator)
 
         expect do
           post "/tags/upload.json", params: { file: invalid_file, name: filename }

From eae7c0e395fe3d73df319df549ebe5d50731900b Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 1 Nov 2019 11:35:57 +0000
Subject: [PATCH 273/328] DEV: Mark flaky test

---
 spec/components/theme_store/zip_exporter_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/components/theme_store/zip_exporter_spec.rb b/spec/components/theme_store/zip_exporter_spec.rb
index 922ae3081d..e7004f6ebc 100644
--- a/spec/components/theme_store/zip_exporter_spec.rb
+++ b/spec/components/theme_store/zip_exporter_spec.rb
@@ -3,7 +3,8 @@
 require 'rails_helper'
 require 'theme_store/zip_exporter'
 
-describe ThemeStore::ZipExporter do
+# This test is flaky
+xdescribe ThemeStore::ZipExporter do
   let!(:theme) do
     Fabricate(:theme, name: "Header Icons").tap do |theme|
       theme.set_field(target: :common, name: :body_tag, value: "<b>testtheme1</b>")

From f9a05e4ae79fb6a4f7568e183cb0fcc24de0a12a Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 1 Nov 2019 12:26:30 +0000
Subject: [PATCH 274/328] DEV: Switch flaky blame to restorer_spec.rb

---
 spec/components/theme_store/zip_exporter_spec.rb | 3 +--
 spec/lib/backup_restore/restorer_spec.rb         | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/components/theme_store/zip_exporter_spec.rb b/spec/components/theme_store/zip_exporter_spec.rb
index e7004f6ebc..922ae3081d 100644
--- a/spec/components/theme_store/zip_exporter_spec.rb
+++ b/spec/components/theme_store/zip_exporter_spec.rb
@@ -3,8 +3,7 @@
 require 'rails_helper'
 require 'theme_store/zip_exporter'
 
-# This test is flaky
-xdescribe ThemeStore::ZipExporter do
+describe ThemeStore::ZipExporter do
   let!(:theme) do
     Fabricate(:theme, name: "Header Icons").tap do |theme|
       theme.set_field(target: :common, name: :body_tag, value: "<b>testtheme1</b>")
diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index c1144c431b..fb13bcafd6 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -2,7 +2,8 @@
 
 require 'rails_helper'
 
-describe BackupRestore::Restorer do
+# Causes flakiness
+xdescribe BackupRestore::Restorer do
   it 'detects which pg_dump output is restorable to different schemas' do
     {
       "9.6.7" => true,

From 2b8a013e322c591f862d37bec653b6ed8aedb28d Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 1 Nov 2019 13:00:40 +0000
Subject: [PATCH 275/328] DEV: Reduce duplication

---
 spec/requests/tags_controller_spec.rb | 33 ++++++++++++---------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 358c1f9937..f1b0d3a2f2 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -3,6 +3,12 @@
 require 'rails_helper'
 
 describe TagsController do
+  define_method(:get_json_body) do
+    ::JSON.parse(response.body)
+  end
+
+  let(:json) { get_json_body }
+
   fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
   fab!(:regular_user) { Fabricate(:trust_level_4) }
@@ -28,7 +34,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tags = JSON.parse(response.body)["tags"]
+        tags = json["tags"]
         expect(tags.length).to eq(1)
         expect(tags[0]['text']).to eq("topic-test")
       end
@@ -53,7 +59,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tags = JSON.parse(response.body)["tags"]
+        tags = json["tags"]
         expect(tags.length).to eq(2)
       end
 
@@ -94,7 +100,7 @@ describe TagsController do
 
       expect(response.status).to eq(200)
 
-      response_tag = JSON.parse(response.body)["valid"].first
+      response_tag = json["valid"].first
       expect(response_tag["value"]).to eq(tag.name)
     end
   end
@@ -160,7 +166,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tag = JSON.parse(response.body)['tags']
+        tag = json['tags']
         expect(tag[0]["id"]).to eq('test')
       end
     end
@@ -175,7 +181,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tag = JSON.parse(response.body)['tags']
+        tag = json['tags']
         expect(tag[0]["id"]).to eq('test')
       end
 
@@ -184,7 +190,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tag = JSON.parse(response.body)['tags']
+        tag = json['tags']
         expect(tag[0]["id"]).to eq('test')
       end
     end
@@ -209,7 +215,7 @@ describe TagsController do
 
     context 'tagging enabled' do
       def parse_topic_ids
-        JSON.parse(response.body)["topic_list"]["topics"]
+        get_json_body["topic_list"]["topics"]
           .map { |topic| topic["id"] }
       end
 
@@ -353,7 +359,6 @@ describe TagsController do
         tag_names.each { |name| Fabricate(:tag, name: name) }
         get "/tags/filter/search.json", params: { q: 'stu' }
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
         expect(json["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped'])
       end
 
@@ -364,7 +369,6 @@ describe TagsController do
 
         get '/tags/filter/search.json', params: { q: 'tag', limit: 2 }
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
         expect(json['results'].map { |j| j['id'] }).to eq(['tag', 'tag2'])
       end
 
@@ -376,7 +380,6 @@ describe TagsController do
           nope = Fabricate(:tag, name: 'nope')
           get "/tags/filter/search.json", params: { q: nope.name, categoryId: category.id }
           expect(response.status).to eq(200)
-          json = ::JSON.parse(response.body)
           expect(json["results"].map { |j| j["id"] }.sort).to eq([])
           expect(json["forbidden"]).to be_present
           expect(json["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name))
@@ -385,7 +388,6 @@ describe TagsController do
         it "can say if given tag is restricted to different category" do
           category
           get "/tags/filter/search.json", params: { q: yup.name, categoryId: Fabricate(:category).id }
-          json = ::JSON.parse(response.body)
           expect(json["results"].map { |j| j["id"] }.sort).to eq([])
           expect(json["forbidden"]).to be_present
           expect(json["forbidden_message"]).to eq(I18n.t(
@@ -400,7 +402,6 @@ describe TagsController do
           nope = Fabricate(:tag, name: 'nope')
           get "/tags/filter/search.json", params: { categoryId: category.id }
           expect(response.status).to eq(200)
-          json = ::JSON.parse(response.body)
           expect(json["results"].map { |j| j["id"] }.sort).to eq([yup.name])
         end
       end
@@ -409,7 +410,6 @@ describe TagsController do
         yup, nope = Fabricate(:tag, name: 'yup'), Fabricate(:tag, name: 'nope')
         get "/tags/filter/search.json", params: { q: 'N/ope' }
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
         expect(json["results"].map { |j| j["id"] }.sort).to eq(["nope"])
       end
 
@@ -418,7 +418,6 @@ describe TagsController do
         Fabricate(:topic, category: c, tags: [Fabricate(:tag, name: "cooltag")])
         get "/tags/filter/search.json", params: { q: "cool" }
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
         expect(json["results"].map { |j| j["id"] }).to eq(['cooltag'])
       end
 
@@ -428,12 +427,12 @@ describe TagsController do
 
         get "/tags/filter/search.json", params: { q: '房' }
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = get_json_body
         expect(json["results"].map { |j| j["id"] }).to eq(['房地产'])
 
         get "/tags/filter/search.json", params: { q: 'тема' }
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = get_json_body
         expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
       end
     end
@@ -458,7 +457,6 @@ describe TagsController do
         it 'returns a tag not found message' do
           delete "/tags/doesntexists.json"
           expect(response).not_to be_successful
-          json = ::JSON.parse(response.body)
           expect(json['error_type']).to eq('not_found')
         end
       end
@@ -491,7 +489,6 @@ describe TagsController do
         it 'returns the correct unused tags' do
           get "/tags/unused.json"
           expect(response.status).to eq(200)
-          json = ::JSON.parse(response.body)
           expect(json["tags"]).to contain_exactly("unused1", "unused2")
         end
 

From 90f934a66033d967fa7893b4ba57bb4d3ae5ee65 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 31 Oct 2019 13:37:24 -0400
Subject: [PATCH 276/328] REFACTOR: Use a module for `Ember.isEmpty`

---
 .../admin/components/admin-user-field-item.js.es6 |  3 ++-
 .../admin/components/embeddable-host.js.es6       |  3 ++-
 .../admin/components/secret-value-list.js.es6     |  3 ++-
 .../admin/components/site-settings/bool.js.es6    |  3 ++-
 .../admin/components/watched-word-form.js.es6     |  3 ++-
 .../admin/controllers/admin-site-settings.js.es6  |  3 ++-
 .../admin/controllers/admin-watched-words.js.es6  |  5 +++--
 .../admin/controllers/admin-web-hooks-show.js.es6 |  7 ++++---
 .../controllers/modals/admin-add-upload.js.es6    |  3 ++-
 .../controllers/modals/admin-silence-user.js.es6  |  3 ++-
 .../controllers/modals/admin-suspend-user.js.es6  |  3 ++-
 app/assets/javascripts/admin/models/report.js.es6 |  3 ++-
 app/assets/javascripts/admin/models/theme.js.es6  |  9 +++++----
 .../javascripts/admin/models/web-hook.js.es6      |  9 +++++----
 .../admin/routes/admin-web-hooks-show.js.es6      |  3 ++-
 app/assets/javascripts/discourse-loader.js        |  3 +++
 .../categories-boxes-with-topics.js.es6           |  3 ++-
 .../discourse/components/categories-boxes.js.es6  |  5 +++--
 .../discourse/components/choose-message.js.es6    |  3 ++-
 .../discourse/components/choose-topic.js.es6      |  3 ++-
 .../components/edit-category-general.js.es6       |  3 ++-
 .../components/edit-topic-timer-form.js.es6       |  3 ++-
 .../discourse/components/future-date-input.js.es6 |  3 ++-
 .../components/group-members-input.js.es6         |  3 ++-
 .../discourse/components/group-selector.js.es6    |  3 ++-
 .../components/groups-form-profile-fields.js.es6  |  3 ++-
 .../discourse/components/image-uploader.js.es6    |  7 ++++---
 .../discourse/components/invite-panel.js.es6      | 11 ++++++-----
 .../discourse/components/share-panel.js.es6       |  3 ++-
 .../discourse/components/share-popup.js.es6       |  3 ++-
 .../discourse/components/tag-groups-form.js.es6   |  3 ++-
 .../components/user-card-contents.js.es6          |  7 ++++---
 .../discourse/components/user-selector.js.es6     |  3 ++-
 .../discourse/controllers/add-post-notice.js.es6  |  3 ++-
 .../discourse/controllers/change-owner.js.es6     |  3 ++-
 .../discourse/controllers/change-timestamp.js.es6 |  3 ++-
 .../discourse/controllers/composer.js.es6         |  9 +++++----
 .../discourse/controllers/create-account.js.es6   | 11 ++++++-----
 .../discourse/controllers/edit-category.js.es6    |  3 ++-
 .../discourse/controllers/forgot-password.js.es6  |  3 ++-
 .../discourse/controllers/full-page-search.js.es6 |  3 ++-
 .../controllers/group-add-members.js.es6          |  3 ++-
 .../discourse/controllers/group-bulk-add.js.es6   |  3 ++-
 .../discourse/controllers/insert-hyperlink.js.es6 |  3 ++-
 .../discourse/controllers/invites-show.js.es6     |  3 ++-
 .../discourse/controllers/login.js.es6            |  5 +++--
 .../discourse/controllers/move-to-topic.js.es6    |  3 ++-
 .../controllers/preferences/account.js.es6        |  3 ++-
 .../controllers/preferences/profile.js.es6        |  7 ++++---
 .../controllers/preferences/username.js.es6       |  3 ++-
 .../request-group-membership-form.js.es6          |  3 ++-
 .../discourse/controllers/topic.js.es6            |  5 +++--
 .../javascripts/discourse/controllers/user.js.es6 |  7 ++++---
 .../helpers/bound-avatar-template.js.es6          |  3 ++-
 .../discourse/helpers/bound-avatar.js.es6         |  3 ++-
 .../discourse/helpers/dash-if-empty.js.es6        |  3 ++-
 .../discourse/helpers/icon-or-image.js.es6        |  5 +++--
 .../javascripts/discourse/lib/logout.js.es6       |  3 ++-
 .../javascripts/discourse/lib/search.js.es6       |  3 ++-
 .../discourse/lib/transform-post.js.es6           |  3 ++-
 app/assets/javascripts/discourse/lib/url.js.es6   |  5 +++--
 .../discourse/mixins/name-validation.js.es6       |  3 ++-
 .../discourse/mixins/password-validation.js.es6   |  7 ++++---
 .../mixins/user-fields-validation.js.es6          |  5 +++--
 .../discourse/mixins/username-validation.js.es6   |  7 ++++---
 .../javascripts/discourse/models/composer.js.es6  | 11 ++++++-----
 .../javascripts/discourse/models/group.js.es6     |  5 +++--
 .../javascripts/discourse/models/model.js.es6     |  3 ++-
 .../discourse/models/post-stream.js.es6           | 11 ++++++-----
 .../javascripts/discourse/models/post.js.es6      |  3 ++-
 .../javascripts/discourse/models/site.js.es6      |  3 ++-
 .../discourse/models/topic-tracking-state.js.es6  |  3 ++-
 .../javascripts/discourse/models/user.js.es6      | 15 ++++++++-------
 .../discourse/routes/topic-from-params.js.es6     |  3 ++-
 .../javascripts/discourse/routes/topic.js.es6     |  3 ++-
 .../discourse/services/logs-notice.js.es6         |  7 ++++---
 .../widgets/default-notification-item.js.es6      |  3 ++-
 .../liked-consolidated-notification-item.js.es6   |  3 ++-
 .../category-drop/category-drop-header.js.es6     |  3 ++-
 .../select-kit/components/category-row.js.es6     |  3 ++-
 .../components/future-date-input-selector.js.es6  |  3 ++-
 .../javascripts/select-kit/mixins/events.js.es6   | 15 ++++++++-------
 app/helpers/application_helper.rb                 |  1 +
 .../discourse-local-dates-create-form.js.es6      |  3 ++-
 test/javascripts/helpers/qunit-helpers.js.es6     |  5 +++--
 85 files changed, 232 insertions(+), 145 deletions(-)

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.es6
index 4c6392635d..23bfac19b4 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { empty } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
@@ -96,7 +97,7 @@ export default Component.extend(bufferedProperty("userField"), {
 
     cancel() {
       const id = this.get("userField.id");
-      if (Ember.isEmpty(id)) {
+      if (isEmpty(id)) {
         this.destroyAction(this.userField);
       } else {
         this.rollbackBuffer();
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index 98e1eab93a..57829b45fb 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
@@ -23,7 +24,7 @@ export default Component.extend(bufferedProperty("host"), {
 
   @computed("buffered.host", "host.isSaving")
   cantSave(host, isSaving) {
-    return isSaving || Ember.isEmpty(host);
+    return isSaving || isEmpty(host);
   },
 
   actions: {
diff --git a/app/assets/javascripts/admin/components/secret-value-list.js.es6 b/app/assets/javascripts/admin/components/secret-value-list.js.es6
index db384bd5c6..1822ba196a 100644
--- a/app/assets/javascripts/admin/components/secret-value-list.js.es6
+++ b/app/assets/javascripts/admin/components/secret-value-list.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
 
@@ -43,7 +44,7 @@ export default Component.extend({
   _checkInvalidInput(inputs) {
     this.set("validationMessage", null);
     for (let input of inputs) {
-      if (Ember.isEmpty(input) || input.includes("|")) {
+      if (isEmpty(input) || input.includes("|")) {
         this.set(
           "validationMessage",
           I18n.t("admin.site_settings.secret_list.invalid_input")
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
index 5bfc0612af..2b2fdaca8e 100644
--- a/app/assets/javascripts/admin/components/site-settings/bool.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -5,7 +6,7 @@ export default Component.extend({
   @computed("value")
   enabled: {
     get(value) {
-      if (Ember.isEmpty(value)) {
+      if (isEmpty(value)) {
         return false;
       }
       return value.toString() === "true";
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index 74bbeeff1e..629c5a2b6a 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import WatchedWord from "admin/models/watched-word";
@@ -23,7 +24,7 @@ export default Component.extend({
 
   @observes("word")
   removeMessage() {
-    if (this.showMessage && !Ember.isEmpty(this.word)) {
+    if (this.showMessage && !isEmpty(this.word)) {
       this.set("showMessage", false);
     }
   },
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 100ff83295..fe35885617 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
@@ -10,7 +11,7 @@ export default Controller.extend({
 
   filterContentNow(category) {
     // If we have no content, don't bother filtering anything
-    if (!!Ember.isEmpty(this.allSiteSettings)) return;
+    if (!!isEmpty(this.allSiteSettings)) return;
 
     let filter;
     if (this.filter) {
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 db269043ee..397c5b030e 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
@@ -11,7 +12,7 @@ export default Controller.extend({
   regularExpressions: null,
 
   filterContentNow() {
-    if (!!Ember.isEmpty(this.allWatchedWords)) return;
+    if (!!isEmpty(this.allWatchedWords)) return;
 
     let filter;
     if (this.filter) {
@@ -44,7 +45,7 @@ export default Controller.extend({
 
   filterContent: debounce(function() {
     this.filterContentNow();
-    this.set("filtered", !Ember.isEmpty(this.filter));
+    this.set("filtered", !isEmpty(this.filter));
   }, 250).observes("filter"),
 
   actions: {
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 0a331bf8cf..83de79e1f0 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,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -38,7 +39,7 @@ export default Controller.extend({
 
   @computed("model.secret")
   secretValidation(secret) {
-    if (!Ember.isEmpty(secret)) {
+    if (!isEmpty(secret)) {
       if (secret.indexOf(" ") !== -1) {
         return InputValidation.create({
           failed: true,
@@ -57,7 +58,7 @@ export default Controller.extend({
 
   @computed("model.wildcard_web_hook", "model.web_hook_event_types.[]")
   eventTypeValidation(isWildcard, eventTypes) {
-    if (!isWildcard && Ember.isEmpty(eventTypes)) {
+    if (!isWildcard && isEmpty(eventTypes)) {
       return InputValidation.create({
         failed: true,
         reason: I18n.t("admin.web_hooks.event_type_missing")
@@ -79,7 +80,7 @@ export default Controller.extend({
   ) {
     return isSaving
       ? false
-      : secretValidation || eventTypeValidation || Ember.isEmpty(payloadUrl);
+      : secretValidation || eventTypeValidation || isEmpty(payloadUrl);
   },
 
   actions: {
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 3d0abf5037..d53278c856 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,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { and, not } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -107,7 +108,7 @@ export default Controller.extend(ModalFunctionality, {
   actions: {
     updateName() {
       let name = this.name;
-      if (Ember.isEmpty(name)) {
+      if (isEmpty(name)) {
         name = $("#file-input")[0].files[0].name;
         this.set("name", name.split(".")[0]);
       }
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.es6
index 15aa4a2806..a64416f2ef 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PenaltyController from "admin/mixins/penalty-controller";
@@ -14,7 +15,7 @@ export default Controller.extend(PenaltyController, {
   @computed("silenceUntil", "reason", "silencing")
   submitDisabled(silenceUntil, reason, silencing) {
     return (
-      silencing || Ember.isEmpty(silenceUntil) || !reason || reason.length < 1
+      silencing || isEmpty(silenceUntil) || !reason || reason.length < 1
     );
   },
 
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.es6
index 18a9e42e58..6a558b2130 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PenaltyController from "admin/mixins/penalty-controller";
@@ -14,7 +15,7 @@ export default Controller.extend(PenaltyController, {
   @computed("suspendUntil", "reason", "suspending")
   submitDisabled(suspendUntil, reason, suspending) {
     return (
-      suspending || Ember.isEmpty(suspendUntil) || !reason || reason.length < 1
+      suspending || isEmpty(suspendUntil) || !reason || reason.length < 1
     );
   },
 
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index b85e2e8c79..df99f0b5be 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { escapeExpression } from "discourse/lib/utilities";
 import { ajax } from "discourse/lib/ajax";
@@ -392,7 +393,7 @@ const Report = Discourse.Model.extend({
   },
 
   _numberLabel(value, options = {}) {
-    const formatNumbers = Ember.isEmpty(options.formatNumbers)
+    const formatNumbers = isEmpty(options.formatNumbers)
       ? true
       : options.formatNumbers;
 
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index b0c5f4729e..bf4700719b 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { or, gt } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -161,11 +162,11 @@ const Theme = RestModel.extend({
 
   hasEdited(target, name) {
     if (name) {
-      return !Ember.isEmpty(this.getField(target, name));
+      return !isEmpty(this.getField(target, name));
     } else {
       let fields = this.theme_fields || [];
       return fields.any(
-        field => field.target === target && !Ember.isEmpty(field.value)
+        field => field.target === target && !isEmpty(field.value)
       );
     }
   },
@@ -227,8 +228,8 @@ const Theme = RestModel.extend({
       themeFields[key] = field;
     } else {
       const changed =
-        (Ember.isEmpty(existingField.value) && !Ember.isEmpty(value)) ||
-        (Ember.isEmpty(value) && !Ember.isEmpty(existingField.value));
+        (isEmpty(existingField.value) && !isEmpty(value)) ||
+        (isEmpty(value) && !isEmpty(existingField.value));
 
       existingField.value = value;
       if (changed) {
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js.es6
index cc35f47437..84111591fa 100644
--- a/app/assets/javascripts/admin/models/web-hook.js.es6
+++ b/app/assets/javascripts/admin/models/web-hook.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import RestModel from "discourse/models/rest";
 import Category from "discourse/models/category";
 import Group from "discourse/models/group";
@@ -78,13 +79,13 @@ export default RestModel.extend({
       wildcard_web_hook: this.wildcard_web_hook,
       verify_certificate: this.verify_certificate,
       active: this.active,
-      web_hook_event_type_ids: Ember.isEmpty(types)
+      web_hook_event_type_ids: isEmpty(types)
         ? [null]
         : types.map(type => type.id),
-      category_ids: Ember.isEmpty(categoryIds) ? [null] : categoryIds,
-      tag_names: Ember.isEmpty(tagNames) ? [null] : tagNames,
+      category_ids: isEmpty(categoryIds) ? [null] : categoryIds,
+      tag_names: isEmpty(tagNames) ? [null] : tagNames,
       group_ids:
-        Ember.isEmpty(groupNames) || Ember.isEmpty(groupNames[0])
+        isEmpty(groupNames) || isEmpty(groupNames[0])
           ? [null]
           : Discourse.Site.currentProp("groups").reduce((groupIds, g) => {
               if (groupNames.includes(g.name)) {
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.es6
index b68675740d..0787886716 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -15,7 +16,7 @@ export default DiscourseRoute.extend({
   setupController(controller, model) {
     if (
       model.get("isNew") ||
-      Ember.isEmpty(model.get("web_hook_event_types"))
+      isEmpty(model.get("web_hook_event_types"))
     ) {
       model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 11bdb9d2fd..408922ea8f 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -66,6 +66,9 @@ var define, requirejs;
       "@ember/service": {
         default: Ember.Service,
         inject: Ember.inject.service
+      },
+      "@ember/utils": {
+        isEmpty: Ember.isEmpty
       }
     };
   }
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.es6
index b3144aeba0..40b16d03fa 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -11,7 +12,7 @@ export default Component.extend({
   @computed("categories.[].uploaded_logo.url")
   anyLogos() {
     return this.categories.any(c => {
-      return !Ember.isEmpty(c.get("uploaded_logo.url"));
+      return !isEmpty(c.get("uploaded_logo.url"));
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
index aa7992b444..11b76ed1d4 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
@@ -12,12 +13,12 @@ export default Component.extend({
 
   @computed("categories.[].uploaded_logo.url")
   anyLogos() {
-    return this.categories.any(c => !Ember.isEmpty(c.get("uploaded_logo.url")));
+    return this.categories.any(c => !isEmpty(c.get("uploaded_logo.url")));
   },
 
   @computed("categories.[].subcategories")
   hasSubcategories() {
-    return this.categories.any(c => !Ember.isEmpty(c.get("subcategories")));
+    return this.categories.any(c => !isEmpty(c.get("subcategories")));
   },
 
   click(e) {
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index be174ad685..dc8e38eab4 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
@@ -31,7 +32,7 @@ export default Component.extend({
   search: debounce(function(title) {
     const currentTopicId = this.currentTopicId;
 
-    if (Ember.isEmpty(title)) {
+    if (isEmpty(title)) {
       this.setProperties({ messages: null, loading: false });
       return;
     }
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index a31aa5eee4..f2d4792414 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import debounce from "discourse/lib/debounce";
@@ -39,7 +40,7 @@ export default Component.extend({
 
     const currentTopicId = this.currentTopicId;
 
-    if (Ember.isEmpty(title)) {
+    if (isEmpty(title)) {
       this.setProperties({ topics: null, loading: false });
       return;
     }
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
index b293a89b76..e94e2a77d2 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
@@ -84,7 +85,7 @@ export default buildCategoryPanel("general", {
   // We can change the parent if there are no children
   @computed("category.id")
   subCategories(categoryId) {
-    if (Ember.isEmpty(categoryId)) {
+    if (isEmpty(categoryId)) {
       return null;
     }
     return Category.list().filterBy("parent_category_id", categoryId);
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.es6
index 9bdf466e70..5b774ca667 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, equal, or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
@@ -34,7 +35,7 @@ export default Component.extend({
   )
   saveDisabled(updateTime, loading, publishToCategory, topicTimerCategoryId) {
     return (
-      Ember.isEmpty(updateTime) ||
+      isEmpty(updateTime) ||
       loading ||
       (publishToCategory && !topicTimerCategoryId)
     );
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
index 5f97d2bbd1..dbec3977f6 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { equal, and, empty } from "@ember/object/computed";
 import Component from "@ember/component";
 import {
@@ -108,7 +109,7 @@ export default Component.extend({
 
     if (
       statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE &&
-      Ember.isEmpty(categoryId)
+      isEmpty(categoryId)
     ) {
       return false;
     }
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index b39049abbf..e1f701f96c 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { lte } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
@@ -62,7 +63,7 @@ export default Component.extend({
     },
 
     addMembers() {
-      if (Ember.isEmpty(this.get("model.usernames"))) {
+      if (isEmpty(this.get("model.usernames"))) {
         return;
       }
       this.model.addMembers(this.get("model.usernames")).catch(popupAjaxError);
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6
index 3083207ff3..4d4b431888 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/group-selector.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import {
   on,
@@ -27,7 +28,7 @@ export default Component.extend({
       allowAny: false,
       items: _.isArray(groupNames)
         ? groupNames
-        : Ember.isEmpty(groupNames)
+        : isEmpty(groupNames)
         ? []
         : [groupNames],
       single: this.single,
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.es6
index cff51ffd73..98eabcea3f 100644
--- a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
 import Component from "@ember/component";
 import {
@@ -65,7 +66,7 @@ export default Component.extend({
 
   checkGroupName: debounce(function() {
     name = this.nameInput;
-    if (Ember.isEmpty(name)) return;
+    if (isEmpty(name)) return;
 
     Group.checkName(name).then(response => {
       const validationName = "uniqueNameValidation";
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index ca919959a8..514a985223 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
@@ -30,7 +31,7 @@ export default Component.extend(UploadMixin, {
 
   @computed("placeholderUrl")
   placeholderStyle(url) {
-    if (Ember.isEmpty(url)) {
+    if (isEmpty(url)) {
       return "".htmlSafe();
     }
     return `background-image: url(${url})`.htmlSafe();
@@ -38,7 +39,7 @@ export default Component.extend(UploadMixin, {
 
   @computed("imageUrl")
   imageCDNURL(url) {
-    if (Ember.isEmpty(url)) {
+    if (isEmpty(url)) {
       return "".htmlSafe();
     }
 
@@ -52,7 +53,7 @@ export default Component.extend(UploadMixin, {
 
   @computed("imageUrl")
   imageBaseName(imageUrl) {
-    if (Ember.isEmpty(imageUrl)) return;
+    if (isEmpty(imageUrl)) return;
     return imageUrl.split("/").slice(-1)[0];
   },
 
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index 513b9be366..aece374581 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, and, equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
@@ -48,7 +49,7 @@ export default Component.extend({
     can_invite_to
   ) {
     if (saving) return true;
-    if (Ember.isEmpty(emailOrUsername)) return true;
+    if (isEmpty(emailOrUsername)) return true;
 
     const emailTrimmed = emailOrUsername.trim();
 
@@ -65,7 +66,7 @@ export default Component.extend({
     // when inviting to private topic via email, group name must be specified
     if (
       isPrivateTopic &&
-      Ember.isEmpty(groupNames) &&
+      isEmpty(groupNames) &&
       emailValid(emailTrimmed)
     ) {
       return true;
@@ -94,7 +95,7 @@ export default Component.extend({
   ) {
     if (hasCustomMessage) return true;
     if (saving) return true;
-    if (Ember.isEmpty(emailOrUsername)) return true;
+    if (isEmpty(emailOrUsername)) return true;
 
     const email = emailOrUsername.trim();
 
@@ -109,7 +110,7 @@ export default Component.extend({
     }
 
     // when inviting to private topic via email, group name must be specified
-    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(email)) {
+    if (isPrivateTopic && isEmpty(groupNames) && emailValid(email)) {
       return true;
     }
 
@@ -218,7 +219,7 @@ export default Component.extend({
         return I18n.t("topic.invite_reply.to_username");
       } else {
         // when inviting to a topic, display instructions based on provided entity
-        if (Ember.isEmpty(emailOrUsername)) {
+        if (isEmpty(emailOrUsername)) {
           return I18n.t("topic.invite_reply.to_topic_blank");
         } else if (emailValid(emailOrUsername)) {
           this.set("inviteIcon", "envelope");
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6
index 81408e1efb..3a7b94b645 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/share-panel.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
@@ -27,7 +28,7 @@ export default Component.extend({
   shareUrl(forcedShareUrl, shareUrl) {
     shareUrl = forcedShareUrl || shareUrl;
 
-    if (Ember.isEmpty(shareUrl)) {
+    if (isEmpty(shareUrl)) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 49d8f67723..4f9d0b9792 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { bind } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
@@ -59,7 +60,7 @@ export default Component.extend({
     const $currentTargetOffset = $target.offset();
     const $this = $(this.element);
 
-    if (Ember.isEmpty(url)) {
+    if (isEmpty(url)) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js.es6 b/app/assets/javascripts/discourse/components/tag-groups-form.js.es6
index 4d932e1d69..2dddb086e8 100644
--- a/app/assets/javascripts/discourse/components/tag-groups-form.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-groups-form.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -8,7 +9,7 @@ export default Component.extend(bufferedProperty("model"), {
 
   @computed("buffered.isSaving", "buffered.name", "buffered.tag_names")
   savingDisabled(isSaving, name, tagNames) {
-    return isSaving || Ember.isEmpty(name) || Ember.isEmpty(tagNames);
+    return isSaving || isEmpty(name) || isEmpty(tagNames);
   },
 
   actions: {
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 023a7ab8a3..b5fd1a4557 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, gte, and, gt, not, or } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
@@ -69,7 +70,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   @computed("user.user_fields.@each.value")
   publicUserFields() {
     const siteUserFields = this.site.get("user_fields");
-    if (!Ember.isEmpty(siteUserFields)) {
+    if (!isEmpty(siteUserFields)) {
       const userFields = this.get("user.user_fields");
       return siteUserFields
         .filterBy("show_on_user_card", true)
@@ -77,7 +78,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
         .map(field => {
           Ember.set(field, "dasherized_name", field.get("name").dasherize());
           const value = userFields ? userFields[field.get("id")] : null;
-          return Ember.isEmpty(value)
+          return isEmpty(value)
             ? null
             : EmberObject.create({ value, field });
         })
@@ -129,7 +130,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     }
 
     const url = this.get("user.card_background_upload_url");
-    const bg = Ember.isEmpty(url) ? "" : `url(${Discourse.getURLWithCDN(url)})`;
+    const bg = isEmpty(url) ? "" : `url(${Discourse.getURLWithCDN(url)})`;
     thisElem.style.backgroundImage = bg;
   },
 
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 2cc95441ed..772777543c 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import TextField from "discourse/components/text-field";
 import userSearch from "discourse/lib/user-search";
@@ -130,7 +131,7 @@ export default TextField.extend({
   // THIS IS A HUGE HACK TO SUPPORT CLEARING THE INPUT
   @observes("usernames")
   _clearInput() {
-    if (arguments.length > 1 && Ember.isEmpty(this.usernames)) {
+    if (arguments.length > 1 && isEmpty(this.usernames)) {
       $(this.element)
         .parent()
         .find("a")
diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6 b/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
index ef05db0d67..83883ca5aa 100644
--- a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
+++ b/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
@@ -13,7 +14,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @computed("saving", "notice")
   disabled(saving, notice) {
-    return saving || Ember.isEmpty(notice);
+    return saving || isEmpty(notice);
   },
 
   onShow() {
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index ca45a50c83..4047a2eb35 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
@@ -17,7 +18,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @computed("saving", "new_user")
   buttonDisabled(saving, newUser) {
-    return saving || Ember.isEmpty(newUser);
+    return saving || isEmpty(newUser);
   },
 
   @computed("saving")
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 0251ab8883..9a29c747d7 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -31,7 +32,7 @@ export default Controller.extend(ModalFunctionality, {
   @computed("saving", "date", "validTimestamp")
   buttonDisabled(saving, date, validTimestamp) {
     if (saving || validTimestamp) return true;
-    return Ember.isEmpty(date);
+    return isEmpty(date);
   },
 
   onShow() {
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index b68fb42a14..195df3baad 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { and, or, alias, reads } from "@ember/object/computed";
 import { debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
@@ -302,7 +303,7 @@ export default Controller.extend({
 
     // We need exactly one user to issue a warning
     if (
-      Ember.isEmpty(usernames) ||
+      isEmpty(usernames) ||
       usernames.split(",").length !== 1 ||
       hasTargetGroups
     ) {
@@ -441,8 +442,8 @@ export default Controller.extend({
       this.closeAutocomplete();
 
       if (
-        Ember.isEmpty(this.get("model.reply")) &&
-        Ember.isEmpty(this.get("model.title"))
+        isEmpty(this.get("model.reply")) &&
+        isEmpty(this.get("model.title"))
       ) {
         this.close();
       } else {
@@ -744,7 +745,7 @@ export default Controller.extend({
   // Notify the composer messages controller that a reply has been typed. Some
   // messages only appear after typing.
   checkReplyLength() {
-    if (!Ember.isEmpty("model.reply")) {
+    if (!isEmpty("model.reply")) {
       this.appEvents.trigger("composer:typed-reply");
     }
   },
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 7a2e4b1359..beb87d2d3a 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 { isEmpty } from "@ember/utils";
 import { notEmpty, or, not } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -91,7 +92,7 @@ export default Controller.extend(
 
     @computed("authOptions.auth_provider")
     passwordRequired(authProvider) {
-      return Ember.isEmpty(authProvider);
+      return isEmpty(authProvider);
     },
 
     @computed
@@ -108,7 +109,7 @@ export default Controller.extend(
     @computed("accountEmail", "rejectedEmails.[]")
     emailValidation(email, rejectedEmails) {
       // If blank, fail without a reason
-      if (Ember.isEmpty(email)) {
+      if (isEmpty(email)) {
         return InputValidation.create({
           failed: true
         });
@@ -176,7 +177,7 @@ export default Controller.extend(
       }
       if (
         this.get("emailValidation.ok") &&
-        (Ember.isEmpty(this.accountUsername) || this.get("authOptions.email"))
+        (isEmpty(this.accountUsername) || this.get("authOptions.email"))
       ) {
         // If email is valid and username has not been entered yet,
         // or email and username were filled automatically by 3rd parth auth,
@@ -226,12 +227,12 @@ export default Controller.extend(
       const userFields = this.userFields;
       const destinationUrl = this.get("authOptions.destination_url");
 
-      if (!Ember.isEmpty(destinationUrl)) {
+      if (!isEmpty(destinationUrl)) {
         $.cookie("destination_url", destinationUrl, { path: "/" });
       }
 
       // Add the userfields to the data
-      if (!Ember.isEmpty(userFields)) {
+      if (!isEmpty(userFields)) {
         attrs.userFields = {};
         userFields.forEach(
           f => (attrs.userFields[f.get("field.id")] = f.get("value"))
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index 6b2e99844f..87c1378ffe 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
@@ -31,7 +32,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @observes("model.description")
   changeSize() {
-    if (!Ember.isEmpty(this.get("model.description"))) {
+    if (!isEmpty(this.get("model.description"))) {
       this.set("modal.modalClass", "edit-category-modal full");
     } else {
       this.set("modal.modalClass", "edit-category-modal small");
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index 7f12df2e28..ae5d53679d 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -11,7 +12,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @computed("accountEmailOrUsername", "disabled")
   submitDisabled(accountEmailOrUsername, disabled) {
-    return Ember.isEmpty((accountEmailOrUsername || "").trim()) || disabled;
+    return isEmpty((accountEmailOrUsername || "").trim()) || disabled;
   },
 
   onShow() {
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 63e8da38fc..e54ce43ab7 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -54,7 +55,7 @@ export default Controller.extend({
 
   @computed("q")
   hasAutofocus(q) {
-    return Ember.isEmpty(q);
+    return isEmpty(q);
   },
 
   @computed("q")
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
index d3bf4a3ea5..53c1327c42 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
@@ -18,7 +19,7 @@ export default Controller.extend(ModalFunctionality, {
 
       const model = this.model;
       const usernames = model.get("usernames");
-      if (Ember.isEmpty(usernames)) {
+      if (isEmpty(usernames)) {
         return;
       }
       let promise;
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
index 4a4323d611..bef9d535f4 100644
--- a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
@@ -9,7 +10,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @computed("input", "loading", "result")
   disableAddButton(input, loading, result) {
-    return loading || Ember.isEmpty(input) || input.length <= 0 || result;
+    return loading || isEmpty(input) || input.length <= 0 || result;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index 63b724f89c..b04499456b 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
@@ -148,7 +149,7 @@ export default Controller.extend(ModalFunctionality, {
         origLink.indexOf("://") === -1 ? `http://${origLink}` : origLink;
       const sel = this._lastSel;
 
-      if (Ember.isEmpty(linkUrl)) {
+      if (isEmpty(linkUrl)) {
         return;
       }
 
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index a129165141..1b1c99de7d 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -68,7 +69,7 @@ export default Controller.extend(
       submit() {
         const userFields = this.userFields;
         let userCustomFields = {};
-        if (!Ember.isEmpty(userFields)) {
+        if (!isEmpty(userFields)) {
           userFields.forEach(function(f) {
             userCustomFields[f.get("field.id")] = f.get("value");
           });
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 177700eb72..19fbc21fb7 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, or, readOnly } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
@@ -107,7 +108,7 @@ export default Controller.extend(ModalFunctionality, {
         return;
       }
 
-      if (Ember.isEmpty(this.loginName) || Ember.isEmpty(this.loginPassword)) {
+      if (isEmpty(this.loginName) || isEmpty(this.loginPassword)) {
         this.flash(I18n.t("login.blank_username_or_password"), "error");
         return;
       }
@@ -273,7 +274,7 @@ export default Controller.extend(ModalFunctionality, {
         return;
       }
 
-      if (Ember.isEmpty(this.loginName)) {
+      if (isEmpty(this.loginName)) {
         this.flash(I18n.t("login.blank_username"), "error");
         return;
       }
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index eece1cd1bc..3b731a23a5 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, equal } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { inject } from "@ember/controller";
@@ -48,7 +49,7 @@ export default Controller.extend(ModalFunctionality, {
   @computed("saving", "selectedTopicId", "topicName")
   buttonDisabled(saving, selectedTopicId, topicName) {
     return (
-      saving || (Ember.isEmpty(selectedTopicId) && Ember.isEmpty(topicName))
+      saving || (isEmpty(selectedTopicId) && isEmpty(topicName))
     );
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 1812fe8e70..e30386afdf 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { not, or, gt } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { iconHTML } from "discourse-common/lib/icon-library";
@@ -241,7 +242,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
         .then(() => {
           if (!token) {
             const redirect = this.siteSettings.logout_redirect;
-            if (Ember.isEmpty(redirect)) {
+            if (isEmpty(redirect)) {
               window.location = Discourse.getURL("/");
             } else {
               window.location.href = redirect;
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index 315c8c9da5..b4e9a46fac 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -24,7 +25,7 @@ export default Controller.extend(PreferencesTabController, {
   @computed("model.user_fields.@each.value")
   userFields() {
     let siteUserFields = this.site.get("user_fields");
-    if (!Ember.isEmpty(siteUserFields)) {
+    if (!isEmpty(siteUserFields)) {
       const userFields = this.get("model.user_fields");
 
       // Staff can edit fields that are not `editable`
@@ -53,9 +54,9 @@ export default Controller.extend(PreferencesTabController, {
         userFields = this.userFields;
 
       // Update the user fields
-      if (!Ember.isEmpty(userFields)) {
+      if (!isEmpty(userFields)) {
         const modelFields = model.get("user_fields");
-        if (!Ember.isEmpty(modelFields)) {
+        if (!isEmpty(modelFields)) {
           userFields.forEach(function(uf) {
             modelFields[uf.get("field.id").toString()] = uf.get("value");
           });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index aab336e2b0..954e8c739e 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import {
@@ -37,7 +38,7 @@ export default Controller.extend({
       this.set("taken", false);
       this.set("errorMessage", null);
 
-      if (Ember.isEmpty(this.newUsername)) return;
+      if (isEmpty(this.newUsername)) return;
       if (this.unchanged) return;
 
       Discourse.User.checkUsername(
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.es6
index 80a3b13edc..0f316873ce 100644
--- a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
+++ b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
@@ -16,7 +17,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @computed("loading", "reason")
   disableSubmit(loading, reason) {
-    return loading || Ember.isEmpty(reason);
+    return loading || isEmpty(reason);
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 0f236ba80f..291e07d29b 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
@@ -72,7 +73,7 @@ export default Controller.extend(bufferedProperty("model"), {
   @observes("model.title", "category")
   _titleChanged() {
     const title = this.get("model.title");
-    if (!Ember.isEmpty(title)) {
+    if (!isEmpty(title)) {
       // force update lazily loaded titles
       this.send("refreshTitle");
     }
@@ -985,7 +986,7 @@ export default Controller.extend(bufferedProperty("model"), {
       composerController
         .open(options)
         .then(() => {
-          return Ember.isEmpty(quotedText) ? "" : quotedText;
+          return isEmpty(quotedText) ? "" : quotedText;
         })
         .then(q => {
           const postUrl = `${location.protocol}//${location.host}${post.get(
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 914aff4aca..f7aa3c10da 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, or, gt, not, and } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { inject as service } from "@ember/service";
@@ -29,7 +30,7 @@ export default Controller.extend(CanCheckEmails, {
 
   @computed("model.profileBackgroundUrl")
   hasProfileBackgroundUrl(background) {
-    return !Ember.isEmpty(background.toString());
+    return !isEmpty(background.toString());
   },
 
   @computed("model.profile_hidden", "indexStream", "viewingSelf", "forceExpand")
@@ -108,7 +109,7 @@ export default Controller.extend(CanCheckEmails, {
   @computed("model.user_fields.@each.value")
   publicUserFields() {
     const siteUserFields = this.site.get("user_fields");
-    if (!Ember.isEmpty(siteUserFields)) {
+    if (!isEmpty(siteUserFields)) {
       const userFields = this.get("model.user_fields");
       return siteUserFields
         .filterBy("show_on_profile", true)
@@ -118,7 +119,7 @@ export default Controller.extend(CanCheckEmails, {
           const value = userFields
             ? userFields[field.get("id").toString()]
             : null;
-          return Ember.isEmpty(value)
+          return isEmpty(value)
             ? null
             : EmberObject.create({ value, field });
         })
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
index 30cb9aa3bd..b08e483b2e 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
@@ -1,8 +1,9 @@
+import { isEmpty } from "@ember/utils";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { avatarImg } from "discourse/lib/utilities";
 
 export default htmlHelper((avatarTemplate, size) => {
-  if (Ember.isEmpty(avatarTemplate)) {
+  if (isEmpty(avatarTemplate)) {
     return "<div class='avatar-placeholder'></div>";
   } else {
     return avatarImg({ size, avatarTemplate });
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
index 077e823220..a1058c4e3d 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
@@ -1,9 +1,10 @@
+import { isEmpty } from "@ember/utils";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { avatarImg } from "discourse/lib/utilities";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
 
 export default htmlHelper((user, size) => {
-  if (Ember.isEmpty(user)) {
+  if (isEmpty(user)) {
     return "<div class='avatar-placeholder'></div>";
   }
 
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
index 18370df0d2..96d594e650 100644
--- a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { htmlHelper } from "discourse-common/lib/helpers";
 
-export default htmlHelper(str => (Ember.isEmpty(str) ? "&mdash;" : str));
+export default htmlHelper(str => (isEmpty(str) ? "&mdash;" : str));
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
index 0751b6f0e2..f038d40eb4 100644
--- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
+++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
@@ -1,12 +1,13 @@
+import { isEmpty } from "@ember/utils";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { iconHTML, convertIconClass } from "discourse-common/lib/icon-library";
 
 export default htmlHelper(function({ icon, image }) {
-  if (!Ember.isEmpty(image)) {
+  if (!isEmpty(image)) {
     return `<img src='${image}'>`;
   }
 
-  if (Ember.isEmpty(icon)) {
+  if (isEmpty(icon)) {
     return "";
   }
 
diff --git a/app/assets/javascripts/discourse/lib/logout.js.es6 b/app/assets/javascripts/discourse/lib/logout.js.es6
index 5e81d738e3..09986e892b 100644
--- a/app/assets/javascripts/discourse/lib/logout.js.es6
+++ b/app/assets/javascripts/discourse/lib/logout.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 export default function logout(siteSettings, keyValueStore) {
   if (!siteSettings || !keyValueStore) {
     const container = Discourse.__container__;
@@ -8,7 +9,7 @@ export default function logout(siteSettings, keyValueStore) {
   keyValueStore.abandonLocal();
 
   const redirect = siteSettings.logout_redirect;
-  if (Ember.isEmpty(redirect)) {
+  if (isEmpty(redirect)) {
     window.location = Discourse.getURL("/");
   } else {
     window.location.href = redirect;
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index a558fdd495..2824268e66 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { findRawTemplate } from "discourse/lib/raw-templates";
@@ -53,7 +54,7 @@ export function translateResults(results, opts) {
       const fullName = Handlebars.Utils.escapeExpression(
         group.full_name || group.display_name
       );
-      const flairUrl = Ember.isEmpty(group.flair_url)
+      const flairUrl = isEmpty(group.flair_url)
         ? null
         : Handlebars.Utils.escapeExpression(group.flair_url);
       const flairColor = Handlebars.Utils.escapeExpression(group.flair_color);
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index 5f882d8a93..e6583cf8f6 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { userPath } from "discourse/lib/url";
 
 const _additionalAttributes = [];
@@ -48,7 +49,7 @@ export function transformBasicPost(post) {
     showFlagDelete: false,
     canRecover: post.can_recover,
     canEdit: post.can_edit,
-    canFlag: !Ember.isEmpty(post.get("flagsAvailable")),
+    canFlag: !isEmpty(post.get("flagsAvailable")),
     canReviewTopic: false,
     reviewableId: post.reviewable_id,
     reviewableScoreCount: post.reviewable_score_count,
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 0dbb7aa3ce..71986d4d29 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
@@ -62,7 +63,7 @@ export function groupPath(subPath) {
 
 let _jumpScheduled = false;
 export function jumpToElement(elementId) {
-  if (_jumpScheduled || Ember.isEmpty(elementId)) {
+  if (_jumpScheduled || isEmpty(elementId)) {
     return;
   }
 
@@ -191,7 +192,7 @@ const DiscourseURL = EmberObject.extend({
   routeTo(path, opts) {
     opts = opts || {};
 
-    if (Ember.isEmpty(path)) {
+    if (isEmpty(path)) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
index b1a07dc3ad..0cf4c796cb 100644
--- a/app/assets/javascripts/discourse/mixins/name-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import InputValidation from "discourse/models/input-validation";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import Mixin from "@ember/object/mixin";
@@ -17,7 +18,7 @@ export default Mixin.create({
   nameValidation() {
     if (
       this.siteSettings.full_name_required &&
-      Ember.isEmpty(this.accountName)
+      isEmpty(this.accountName)
     ) {
       return InputValidation.create({ failed: true });
     }
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
index 4096ccc2a0..3ddf9131f0 100644
--- a/app/assets/javascripts/discourse/mixins/password-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import InputValidation from "discourse/models/input-validation";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import Mixin from "@ember/object/mixin";
@@ -55,7 +56,7 @@ export default Mixin.create({
     }
 
     // If blank, fail without a reason
-    if (Ember.isEmpty(password)) {
+    if (isEmpty(password)) {
       return InputValidation.create({ failed: true });
     }
 
@@ -67,14 +68,14 @@ export default Mixin.create({
       });
     }
 
-    if (!Ember.isEmpty(accountUsername) && password === accountUsername) {
+    if (!isEmpty(accountUsername) && password === accountUsername) {
       return InputValidation.create({
         failed: true,
         reason: I18n.t("user.password.same_as_username")
       });
     }
 
-    if (!Ember.isEmpty(accountEmail) && password === accountEmail) {
+    if (!isEmpty(accountEmail) && password === accountEmail) {
       return InputValidation.create({
         failed: true,
         reason: I18n.t("user.password.same_as_email")
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
index 3fd0d26c86..ec007c993d 100644
--- a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import InputValidation from "discourse/models/input-validation";
 import {
@@ -29,10 +30,10 @@ export default Mixin.create({
     if (userFields) {
       userFields = userFields.filterBy("field.required");
     }
-    if (!Ember.isEmpty(userFields)) {
+    if (!isEmpty(userFields)) {
       const anyEmpty = userFields.any(uf => {
         const val = uf.get("value");
-        return !val || Ember.isEmpty(val);
+        return !val || isEmpty(val);
       });
       if (anyEmpty) {
         return InputValidation.create({ failed: true });
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
index 9aa8ea4b70..66e86221a9 100644
--- a/app/assets/javascripts/discourse/mixins/username-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import InputValidation from "discourse/models/input-validation";
 import debounce from "discourse/lib/debounce";
 import { setting } from "discourse/lib/computed";
@@ -15,7 +16,7 @@ export default Mixin.create({
     Discourse.User.checkUsername(null, this.accountEmail).then(result => {
       if (
         result.suggestion &&
-        (Ember.isEmpty(this.accountUsername) ||
+        (isEmpty(this.accountUsername) ||
           this.accountUsername === this.get("authOptions.username"))
       ) {
         this.setProperties({
@@ -38,7 +39,7 @@ export default Mixin.create({
     }
 
     // If blank, fail without a reason
-    if (Ember.isEmpty(accountUsername)) {
+    if (isEmpty(accountUsername)) {
       return InputValidation.create({ failed: true });
     }
 
@@ -68,7 +69,7 @@ export default Mixin.create({
 
   shouldCheckUsernameAvailability() {
     return (
-      !Ember.isEmpty(this.accountUsername) &&
+      !isEmpty(this.accountUsername) &&
       this.accountUsername.length >= this.minUsernameLength
     );
   },
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 217f48eb62..57b0478e2a 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -116,7 +117,7 @@ const Composer = RestModel.extend({
     set(categoryId) {
       const oldCategoryId = this._categoryId;
 
-      if (Ember.isEmpty(categoryId)) {
+      if (isEmpty(categoryId)) {
         categoryId = null;
       }
       this._categoryId = categoryId;
@@ -420,7 +421,7 @@ const Composer = RestModel.extend({
 
   @computed("metaData")
   hasMetaData(metaData) {
-    return metaData ? Ember.isEmpty(Ember.keys(metaData)) : false;
+    return metaData ? isEmpty(Ember.keys(metaData)) : false;
   },
 
   replyDirty: propertyNotEqual("reply", "originalText"),
@@ -610,7 +611,7 @@ const Composer = RestModel.extend({
       }
     }
 
-    if (!Ember.isEmpty(reply)) {
+    if (!isEmpty(reply)) {
       return;
     }
 
@@ -633,7 +634,7 @@ const Composer = RestModel.extend({
     if (!opts) opts = {};
     this.set("loading", false);
 
-    const replyBlank = Ember.isEmpty(this.reply);
+    const replyBlank = isEmpty(this.reply);
 
     const composer = this;
     if (
@@ -1055,7 +1056,7 @@ const Composer = RestModel.extend({
 
     let data = this.serialize(_draft_serializer);
 
-    if (data.postId && !Ember.isEmpty(this.originalText)) {
+    if (data.postId && !isEmpty(this.originalText)) {
       data.originalText = this.originalText;
     }
 
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 3bc06e9d97..b25746471e 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { notEmpty, equal } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -27,7 +28,7 @@ const Group = RestModel.extend({
 
   @computed("automatic_membership_email_domains")
   emailDomains(value) {
-    return Ember.isEmpty(value) ? "" : value;
+    return isEmpty(value) ? "" : value;
   },
 
   @computed("automatic")
@@ -44,7 +45,7 @@ const Group = RestModel.extend({
   },
 
   findMembers(params) {
-    if (Ember.isEmpty(this.name) || !this.can_see_members) {
+    if (isEmpty(this.name) || !this.can_see_members) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/models/model.js.es6 b/app/assets/javascripts/discourse/models/model.js.es6
index ea1c950688..5ce0eb2eaf 100644
--- a/app/assets/javascripts/discourse/models/model.js.es6
+++ b/app/assets/javascripts/discourse/models/model.js.es6
@@ -1,10 +1,11 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 const Model = EmberObject.extend();
 
 Model.reopenClass({
   extractByKey(collection, klass) {
     const retval = {};
-    if (Ember.isEmpty(collection)) {
+    if (isEmpty(collection)) {
       return retval;
     }
 
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 60f3f8d69d..0f60c6e737 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { or, not, and } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
@@ -114,7 +115,7 @@ export default RestModel.extend({
     }
 
     const userFilters = this.userFilters;
-    if (!Ember.isEmpty(userFilters)) {
+    if (!isEmpty(userFilters)) {
       result.username_filters = userFilters.join(",");
     }
 
@@ -361,7 +362,7 @@ export default RestModel.extend({
       });
     } else {
       const postIds = this.nextWindow;
-      if (Ember.isEmpty(postIds)) return Ember.RSVP.resolve();
+      if (isEmpty(postIds)) return Ember.RSVP.resolve();
       this.set("loadingBelow", true);
       postsWithPlaceholders.appending(postIds);
 
@@ -402,7 +403,7 @@ export default RestModel.extend({
       });
     } else {
       const postIds = this.previousWindow;
-      if (Ember.isEmpty(postIds)) return Ember.RSVP.resolve();
+      if (isEmpty(postIds)) return Ember.RSVP.resolve();
       this.set("loadingAbove", true);
 
       return this.findPostsByIds(postIds.reverse())
@@ -520,7 +521,7 @@ export default RestModel.extend({
   },
 
   removePosts(posts) {
-    if (Ember.isEmpty(posts)) {
+    if (isEmpty(posts)) {
       return;
     }
 
@@ -955,7 +956,7 @@ export default RestModel.extend({
   },
 
   loadIntoIdentityMap(postIds) {
-    if (Ember.isEmpty(postIds)) {
+    if (isEmpty(postIds)) {
       return Ember.RSVP.resolve([]);
     }
 
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 77fe18dc87..59487da87d 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,3 +1,4 @@
+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";
@@ -93,7 +94,7 @@ const Post = RestModel.extend({
 
   @computed("link_counts.@each.internal")
   internalLinks() {
-    if (Ember.isEmpty(this.link_counts)) return null;
+    if (isEmpty(this.link_counts)) return null;
 
     return this.link_counts.filterBy("internal").filterBy("title");
   },
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 46715900cd..6057ece5da 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { alias, sort } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
@@ -39,7 +40,7 @@ const Site = RestModel.extend({
 
     let siteFields = this.user_fields;
 
-    if (!Ember.isEmpty(siteFields)) {
+    if (!isEmpty(siteFields)) {
       return siteFields.map(f => {
         let value = fields ? fields[f.id.toString()] : null;
         value = value || "&mdash;".htmlSafe();
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 5c726069d3..13476b900e 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import {
   default as computed,
@@ -215,7 +216,7 @@ const TopicTrackingState = Discourse.Model.extend({
 
   // If we have a cached topic list, we can update it from our tracking information.
   updateTopics(topics) {
-    if (Ember.isEmpty(topics)) {
+    if (isEmpty(topics)) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 88910cd58e..e20a29f379 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { gt, equal, or } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
@@ -86,7 +87,7 @@ const User = RestModel.extend({
 
   @computed("username", "name")
   displayName(username, name) {
-    if (Discourse.SiteSettings.enable_names && !Ember.isEmpty(name)) {
+    if (Discourse.SiteSettings.enable_names && !isEmpty(name)) {
       return name;
     }
     return username;
@@ -95,7 +96,7 @@ const User = RestModel.extend({
   @computed("profile_background_upload_url")
   profileBackgroundUrl(bgUrl) {
     if (
-      Ember.isEmpty(bgUrl) ||
+      isEmpty(bgUrl) ||
       !Discourse.SiteSettings.allow_profile_backgrounds
     ) {
       return "".htmlSafe();
@@ -515,7 +516,7 @@ const User = RestModel.extend({
   // The user's stat count, excluding PMs.
   @computed("statsExcludingPms.@each.count")
   statsCountNonPM() {
-    if (Ember.isEmpty(this.statsExcludingPms)) return 0;
+    if (isEmpty(this.statsExcludingPms)) return 0;
     let count = 0;
     this.statsExcludingPms.forEach(val => {
       if (this.inAllStream(val)) {
@@ -528,7 +529,7 @@ const User = RestModel.extend({
   // The user's stats, excluding PMs.
   @computed("stats.@each.isPM")
   statsExcludingPms() {
-    if (Ember.isEmpty(this.stats)) return [];
+    if (isEmpty(this.stats)) return [];
     return this.stats.rejectBy("isPM");
   },
 
@@ -538,7 +539,7 @@ const User = RestModel.extend({
     return PreloadStore.getAndRemove(`user_${user.get("username")}`, () => {
       return ajax(userPath(`${user.get("username")}.json`), { data: options });
     }).then(json => {
-      if (!Ember.isEmpty(json.user.stats)) {
+      if (!isEmpty(json.user.stats)) {
         json.user.stats = Discourse.User.groupStats(
           json.user.stats.map(s => {
             if (s.count) s.count = parseInt(s.count, 10);
@@ -547,7 +548,7 @@ const User = RestModel.extend({
         );
       }
 
-      if (!Ember.isEmpty(json.user.groups)) {
+      if (!isEmpty(json.user.groups)) {
         const groups = [];
 
         for (let i = 0; i < json.user.groups.length; i++) {
@@ -563,7 +564,7 @@ const User = RestModel.extend({
         json.user.invited_by = Discourse.User.create(json.user.invited_by);
       }
 
-      if (!Ember.isEmpty(json.user.featured_user_badge_ids)) {
+      if (!isEmpty(json.user.featured_user_badge_ids)) {
         const userBadgesMap = {};
         UserBadge.createFromJson(json).forEach(userBadge => {
           userBadgesMap[userBadge.get("id")] = userBadge;
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index 6f626644a4..08c4671236 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { scheduleOnce } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
@@ -68,7 +69,7 @@ export default DiscourseRoute.extend({
         }
         DiscourseURL.jumpToPost(closest, opts);
 
-        if (!Ember.isEmpty(topic.draft)) {
+        if (!isEmpty(topic.draft)) {
           composerController.open({
             draft: Draft.getLocal(topic.draft_key, topic.draft),
             draftKey: topic.draft_key,
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index f992c01c5b..60bc266f00 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { cancel } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
 import { later } from "@ember/runloop";
@@ -220,7 +221,7 @@ const TopicRoute = DiscourseRoute.extend({
       userFilters = postStream.get("userFilters");
 
     userFilters.clear();
-    if (!Ember.isEmpty(usernames) && usernames !== "undefined") {
+    if (!isEmpty(usernames) && usernames !== "undefined") {
       userFilters.addObjects(usernames.split(","));
     }
 
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js.es6
index 3395489ce4..73961054a1 100644
--- a/app/assets/javascripts/discourse/services/logs-notice.js.es6
+++ b/app/assets/javascripts/discourse/services/logs-notice.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import {
   default as computed,
@@ -48,7 +49,7 @@ const LogsNotice = EmberObject.extend({
 
   @computed("text")
   isEmpty(text) {
-    return Ember.isEmpty(text);
+    return isEmpty(text);
   },
 
   @computed("text")
@@ -62,8 +63,8 @@ const LogsNotice = EmberObject.extend({
   },
 
   @computed("isEmpty", "isAdmin")
-  hidden(isEmpty, isAdmin) {
-    return !isAdmin || isEmpty;
+  hidden(thisIsEmpty, isAdmin) {
+    return !isAdmin || thisIsEmpty;
   },
 
   @observes("text")
diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
index afbdbb59bd..49d70e086e 100644
--- a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
@@ -74,7 +75,7 @@ export const DefaultNotificationItem = createWidget(
 
       const description = data.topic_title;
 
-      return Ember.isEmpty(description) ? "" : escapeExpression(description);
+      return isEmpty(description) ? "" : escapeExpression(description);
     },
 
     text(notificationName, data) {
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.es6
index 61609ea09f..96a3604255 100644
--- a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -25,7 +26,7 @@ createWidgetFrom(
         }
       );
 
-      return Ember.isEmpty(description) ? "" : escapeExpression(description);
+      return isEmpty(description) ? "" : escapeExpression(description);
     }
   }
 );
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.es6
index 629accda68..c04fc30840 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
 import computed from "ember-addons/ember-computed-decorators";
 import Category from "discourse/models/category";
@@ -12,7 +13,7 @@ export default ComboBoxSelectBoxHeaderComponent.extend({
 
   @computed("computedContent.value", "computedContent.name")
   category(value, name) {
-    if (Ember.isEmpty(value)) {
+    if (isEmpty(value)) {
       const uncat = Category.findUncategorized();
       if (uncat && uncat.get("name") === name) {
         return uncat;
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index 2915301422..8523bfb07e 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import computed from "ember-addons/ember-computed-decorators";
 import Category from "discourse/models/category";
@@ -27,7 +28,7 @@ export default SelectKitRowComponent.extend({
 
   @computed("computedContent.value", "computedContent.name")
   category(value, name) {
-    if (Ember.isEmpty(value)) {
+    if (isEmpty(value)) {
       const uncat = Category.findUncategorized();
       if (uncat && uncat.get("name") === name) {
         return uncat;
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 7944b82598..f5167afb20 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
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import ComboBoxComponent from "select-kit/components/combo-box";
 import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
 import DatetimeMixin from "select-kit/components/future-date-input-selector/mixin";
@@ -239,7 +240,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
       let input = null;
       const { time } = this._updateAt(value);
 
-      if (time && !Ember.isEmpty(value)) {
+      if (time && !isEmpty(value)) {
         input = time.locale("en").format(FORMAT);
       }
 
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index f37cade557..0d6e7013a7 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { throttle } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import { on } from "ember-addons/ember-computed-decorators";
@@ -114,14 +115,14 @@ export default Mixin.create({
       this.unfocus(event);
     }
     if (keyCode === this.keys.TAB && !event.shiftKey) this.tabFromHeader(event);
-    if (Ember.isEmpty(this.filter) && keyCode === this.keys.BACKSPACE)
+    if (isEmpty(this.filter) && keyCode === this.keys.BACKSPACE)
       this.backspaceFromHeader(event);
     if (keyCode === this.keys.ESC) this.escapeFromHeader(event);
     if (keyCode === this.keys.ENTER) this.enterFromHeader(event);
     if ([this.keys.UP, this.keys.DOWN].includes(keyCode))
       this.upAndDownFromHeader(event);
     if (
-      Ember.isEmpty(this.filter) &&
+      isEmpty(this.filter) &&
       [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)
     ) {
       this.leftAndRightFromHeader(event);
@@ -154,7 +155,7 @@ export default Mixin.create({
     const keyCode = event.keyCode || event.which;
 
     if (
-      Ember.isEmpty(this.filter) &&
+      isEmpty(this.filter) &&
       keyCode === this.keys.BACKSPACE &&
       typeof this.didPressBackspaceFromFilter === "function"
     ) {
@@ -171,7 +172,7 @@ export default Mixin.create({
       this.upAndDownFromFilter(event);
 
     if (
-      Ember.isEmpty(this.filter) &&
+      isEmpty(this.filter) &&
       [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)
     ) {
       this.leftAndRightFromFilter(event);
@@ -197,7 +198,7 @@ export default Mixin.create({
       return true;
     }
 
-    if (Ember.isEmpty(this.filter)) {
+    if (isEmpty(this.filter)) {
       this.close(event);
       return true;
     }
@@ -285,7 +286,7 @@ export default Mixin.create({
 
     if (!this.selection || !this.selection.length) return;
 
-    if (!Ember.isEmpty(this.filter)) {
+    if (!isEmpty(this.filter)) {
       this.clearHighlightSelection();
       return;
     }
@@ -336,7 +337,7 @@ export default Mixin.create({
       return;
     }
 
-    if (Ember.isEmpty(this.selection)) return;
+    if (isEmpty(this.selection)) return;
 
     const keyCode = event.keyCode || event.which;
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 96531a9a18..383aca79aa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -442,6 +442,7 @@ module ApplicationHelper
       ids = theme_ids
     end
 
+    Rails.logger.info "0 >>>>>> #{name}"
     Stylesheet::Manager.stylesheet_link_tag(name, 'all', ids)
   end
 
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 76e3d64088..de01b5ef9c 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,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
@@ -358,7 +359,7 @@ export default Component.extend({
   },
 
   _setTimeIfValid(time, key) {
-    if (Ember.isEmpty(time)) {
+    if (isEmpty(time)) {
       this.set(key, null);
       return;
     }
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index ca1bd8363a..59f00c71ec 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import { run } from "@ember/runloop";
 import { later } from "@ember/runloop";
 /* global QUnit, resetSite */
@@ -182,7 +183,7 @@ QUnit.assert.not = function(actual, message) {
 
 QUnit.assert.blank = function(actual, message) {
   this.pushResult({
-    result: Ember.isEmpty(actual),
+    result: isEmpty(actual),
     actual,
     message
   });
@@ -190,7 +191,7 @@ QUnit.assert.blank = function(actual, message) {
 
 QUnit.assert.present = function(actual, message) {
   this.pushResult({
-    result: !Ember.isEmpty(actual),
+    result: !isEmpty(actual),
     actual,
     message
   });

From 89f602f66bb81bc6c40d09e02aa56088a9b1218d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 31 Oct 2019 13:55:01 -0400
Subject: [PATCH 277/328] REFACTOR: `Ember.makeArray` was removed from the
 public API

---
 .../javascripts/admin/components/admin-report-chart.js.es6 | 5 +++--
 .../admin/components/admin-report-stacked-chart.js.es6     | 3 ++-
 .../javascripts/admin/components/admin-report-table.js.es6 | 3 ++-
 .../javascripts/admin/components/admin-report.js.es6       | 3 ++-
 app/assets/javascripts/admin/components/value-list.js.es6  | 3 ++-
 .../admin/controllers/admin-customize-themes-show.js.es6   | 5 +++--
 .../admin/controllers/admin-dashboard-general.js.es6       | 5 +++--
 app/assets/javascripts/admin/models/report.js.es6          | 3 ++-
 app/assets/javascripts/discourse/lib/utilities.js.es6      | 7 +++++++
 .../discourse/widgets/private-message-map.js.es6           | 3 ++-
 .../select-kit/components/category-selector.js.es6         | 5 +++--
 .../select-kit/components/mini-tag-chooser.js.es6          | 5 +++--
 .../components/multi-select/multi-select-header.js.es6     | 5 +++--
 .../javascripts/select-kit/components/tag-chooser.js.es6   | 3 ++-
 .../javascripts/select-kit/components/tag-drop.js.es6      | 3 ++-
 app/assets/javascripts/select-kit/mixins/events.js.es6     | 5 +++--
 16 files changed, 44 insertions(+), 22 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 1f23998d6b..a64a2e3479 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { debounce } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
@@ -49,10 +50,10 @@ export default Component.extend({
     if (!chartCanvas) return;
 
     const context = chartCanvas.getContext("2d");
-    const chartData = Ember.makeArray(
+    const chartData = makeArray(
       model.get("chartData") || model.get("data")
     );
-    const prevChartData = Ember.makeArray(
+    const prevChartData = makeArray(
       model.get("prevChartData") || model.get("prev_data")
     );
 
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 77604527ed..d233d131e2 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,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { debounce } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
@@ -52,7 +53,7 @@ export default Component.extend({
 
     const context = chartCanvas.getContext("2d");
 
-    const chartData = Ember.makeArray(
+    const chartData = makeArray(
       model.get("chartData") || model.get("data")
     );
 
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js.es6
index c82896d577..7cba55bf3a 100644
--- a/app/assets/javascripts/admin/components/admin-report-table.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
@@ -91,7 +92,7 @@ export default Component.extend({
 
   @computed("sortLabel", "sortDirection", "model.data.[]")
   sortedData(sortLabel, sortDirection, data) {
-    data = Ember.makeArray(data);
+    data = makeArray(data);
 
     if (sortLabel) {
       const compare = (label, direction) => {
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index d0a841ca21..d7ddfc2151 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
@@ -108,7 +109,7 @@ export default Component.extend({
   displayedModes(currentMode, reportModes, forcedModes) {
     const modes = forcedModes ? forcedModes.split(",") : reportModes;
 
-    return Ember.makeArray(modes).map(mode => {
+    return makeArray(modes).map(mode => {
       const base = `btn-default mode-btn ${mode}`;
       const cssClass = currentMode === mode ? `${base} is-current` : base;
 
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6
index aa21a2f48b..5ab15aa63e 100644
--- a/app/assets/javascripts/admin/components/value-list.js.es6
+++ b/app/assets/javascripts/admin/components/value-list.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { empty, alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
@@ -31,7 +32,7 @@ export default Component.extend({
 
   @computed("choices.[]", "collection.[]")
   filteredChoices(choices, collection) {
-    return Ember.makeArray(choices).filter(i => collection.indexOf(i) < 0);
+    return makeArray(choices).filter(i => collection.indexOf(i) < 0);
   },
 
   keyDown(event) {
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.es6
index 2ef5ee09b6..c554586f6a 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { empty, notEmpty, match } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
@@ -126,8 +127,8 @@ export default Controller.extend({
         });
 
         this.get("parentController.model.content").forEach(theme => {
-          const children = Ember.makeArray(theme.get("childThemes"));
-          const rawChildren = Ember.makeArray(theme.get("child_themes"));
+          const children = makeArray(theme.get("childThemes"));
+          const rawChildren = makeArray(theme.get("child_themes"));
           const index = children ? children.indexOf(model) : -1;
           if (index > -1) {
             children.splice(index, 1);
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
index 23bdbcf5f0..da78555f07 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
@@ -8,7 +9,7 @@ import PeriodComputationMixin from "admin/mixins/period-computation";
 
 function staticReport(reportType) {
   return Ember.computed("reports.[]", function() {
-    return Ember.makeArray(this.reports).find(
+    return makeArray(this.reports).find(
       report => report.type === reportType
     );
   });
@@ -95,7 +96,7 @@ export default Controller.extend(PeriodComputationMixin, {
           this.setProperties({
             dashboardFetchedAt: new Date(),
             model: adminDashboardModel,
-            reports: Ember.makeArray(adminDashboardModel.reports).map(x =>
+            reports: makeArray(adminDashboardModel.reports).map(x =>
               Report.create(x)
             )
           });
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index df99f0b5be..4416e1e9f3 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -137,7 +138,7 @@ const Report = Discourse.Model.extend({
 
   @computed("data", "currentTotal")
   currentAverage(data, total) {
-    return Ember.makeArray(data).length === 0
+    return makeArray(data).length === 0
       ? 0
       : parseFloat((total / parseFloat(data.length)).toFixed(1));
   },
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 599c3a4965..eac6471bc7 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -3,6 +3,13 @@ import toMarkdown from "discourse/lib/to-markdown";
 
 const homepageSelector = "meta[name=discourse_current_homepage]";
 
+export function makeArray(obj) {
+  if (obj === null || obj === undefined) {
+    return [];
+  }
+  return Array.isArray(obj) ? obj : [obj];
+}
+
 export function translateSize(size) {
   switch (size) {
     case "tiny":
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
index faf7ebe164..02a4ae32d1 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { avatarFor, avatarImg } from "discourse/widgets/post";
@@ -146,7 +147,7 @@ export default createWidget("private-message-map", {
     if (
       !this.state.isEditing &&
       this.site.mobileView &&
-      Ember.makeArray(participants[0]).length > 4
+      makeArray(participants[0]).length > 4
     ) {
       hideNamesClass = ".hide-names";
     }
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index c9f1f974fa..b53e8ea2a8 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import MultiSelectComponent from "select-kit/components/multi-select";
 import Category from "discourse/models/category";
 
@@ -28,7 +29,7 @@ export default MultiSelectComponent.extend({
   },
 
   computeValues() {
-    return Ember.makeArray(this.categories).map(c => c.id);
+    return makeArray(this.categories).map(c => c.id);
   },
 
   mutateValues(values) {
@@ -43,7 +44,7 @@ export default MultiSelectComponent.extend({
   },
 
   computeContent() {
-    const blacklist = Ember.makeArray(this.blacklist);
+    const blacklist = makeArray(this.blacklist);
     return Category.list().filter(category => {
       return (
         this.categories.includes(category) || !blacklist.includes(category)
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.es6
index 4d579c4d53..bfd9a44af8 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import Category from "discourse/models/category";
 import ComboBox from "select-kit/components/combo-box";
 import TagsMixin from "select-kit/mixins/tags";
@@ -5,7 +6,7 @@ import { default as computed } from "ember-addons/ember-computed-decorators";
 import renderTag from "discourse/lib/render-tag";
 import { escapeExpression } from "discourse/lib/utilities";
 import { iconHTML } from "discourse-common/lib/icon-library";
-const { get, isEmpty, run, makeArray } = Ember;
+const { get, isEmpty, run } = Ember;
 
 export default ComboBox.extend(TagsMixin, {
   allowContentReplacement: true,
@@ -226,7 +227,7 @@ export default ComboBox.extend(TagsMixin, {
   },
 
   destroyTags(tags) {
-    tags = Ember.makeArray(tags).map(c => get(c, "value"));
+    tags = makeArray(tags).map(c => get(c, "value"));
 
     // work around usage with buffered proxy
     // it does not listen on array changes, similar hack already on select
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.es6
index 191e694e6f..e53746cbfe 100644
--- 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.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
@@ -39,14 +40,14 @@ export default SelectKitHeaderComponent.extend({
 
   @computed("computedContent.selection.[]")
   names(selection) {
-    return Ember.makeArray(selection)
+    return makeArray(selection)
       .map(s => s.name)
       .join(",");
   },
 
   @computed("computedContent.selection.[]")
   values(selection) {
-    return Ember.makeArray(selection)
+    return makeArray(selection)
       .map(s => s.value)
       .join(",");
   }
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
index e03450bab2..b218df9a25 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -2,7 +2,8 @@ import MultiSelectComponent from "select-kit/components/multi-select";
 import TagsMixin from "select-kit/mixins/tags";
 import renderTag from "discourse/lib/render-tag";
 import computed from "ember-addons/ember-computed-decorators";
-const { get, run, makeArray } = Ember;
+import { makeArray } from "discourse/lib/utilities";
+const { get, run } = Ember;
 
 export default MultiSelectComponent.extend(TagsMixin, {
   pluginApiIdentifiers: ["tag-chooser"],
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index d88ec1614c..d173c60bb0 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import ComboBoxComponent from "select-kit/components/combo-box";
 import DiscourseURL from "discourse/lib/url";
 import TagsMixin from "select-kit/mixins/tags";
@@ -123,7 +124,7 @@ export default ComboBoxComponent.extend(TagsMixin, {
     if (this.siteSettings.tags_sort_alphabetically && topTags) {
       return shortcuts.concat(topTags.sort());
     } else {
-      return shortcuts.concat(Ember.makeArray(topTags));
+      return shortcuts.concat(makeArray(topTags));
     }
   },
 
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 0d6e7013a7..b43c2542d0 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,3 +1,4 @@
+import { makeArray } from "discourse/lib/utilities";
 import { isEmpty } from "@ember/utils";
 import { throttle } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
@@ -293,7 +294,7 @@ export default Mixin.create({
 
     if (!this.highlightedSelection.length) {
       // try to highlight the last non locked item from the current selection
-      Ember.makeArray(this.selection)
+      makeArray(this.selection)
         .slice()
         .reverse()
         .some(selection => {
@@ -311,7 +312,7 @@ export default Mixin.create({
   },
 
   didPressSelectAll() {
-    this.highlightSelection(Ember.makeArray(this.selection));
+    this.highlightSelection(makeArray(this.selection));
   },
 
   didClickOutside(event) {

From 640a05c4ee4e79768e741d0ea678f1fc2caec0f5 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 31 Oct 2019 16:28:10 -0400
Subject: [PATCH 278/328] REFACTOR: Remove `Ember.get`

---
 app/assets/javascripts/admin/models/theme.js.es6    |  3 ++-
 .../admin/routes/admin-badges-show.js.es6           |  3 ++-
 .../javascripts/admin/routes/admin-user.js.es6      |  3 ++-
 .../admin/routes/admin-web-hooks-show-events.js.es6 |  3 ++-
 .../admin/routes/admin-web-hooks-show.js.es6        |  3 ++-
 .../javascripts/discourse-common/lib/helpers.js.es6 |  6 +++---
 .../discourse-common/lib/raw-handlebars.js.es6      | 10 ++++++----
 app/assets/javascripts/discourse-loader.js          |  5 ++++-
 .../discourse/components/choose-message.js.es6      |  3 ++-
 .../discourse/components/suggested-topics.js.es6    |  3 ++-
 .../discourse/helpers/bound-avatar.js.es6           |  3 ++-
 .../discourse/helpers/category-link.js.es6          |  7 +++----
 .../discourse/helpers/editable-value.js.es6         |  3 ++-
 .../discourse/helpers/user-avatar.js.es6            | 13 +++++++------
 .../javascripts/discourse/lib/plugin-api.js.es6     |  2 +-
 .../javascripts/discourse/models/category.js.es6    |  7 ++++---
 .../javascripts/discourse/models/post-stream.js.es6 |  9 +++++----
 app/assets/javascripts/discourse/models/post.js.es6 |  3 ++-
 app/assets/javascripts/discourse/models/site.js.es6 |  3 ++-
 .../discourse/models/topic-tracking-state.js.es6    |  5 +++--
 .../javascripts/discourse/models/topic.js.es6       |  3 ++-
 .../discourse/routes/group-activity-posts.js.es6    |  3 ++-
 .../javascripts/discourse/routes/topic.js.es6       |  5 +++--
 .../javascripts/discourse/services/search.js.es6    |  3 ++-
 .../discourse/services/theme-settings.js.es6        |  3 ++-
 .../javascripts/discourse/widgets/header.js.es6     |  3 ++-
 .../discourse/widgets/search-menu-controls.js.es6   |  5 +++--
 .../discourse/widgets/search-menu.js.es6            |  3 ++-
 .../select-kit/components/category-selector.js.es6  |  3 ++-
 .../select-kit/components/mini-tag-chooser.js.es6   |  9 ++++-----
 .../javascripts/select-kit/mixins/events.js.es6     |  3 ++-
 31 files changed, 84 insertions(+), 56 deletions(-)

diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index bf4700719b..4ea3d3e216 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { or, gt } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
@@ -243,7 +244,7 @@ const Theme = RestModel.extend({
   @computed("childThemes.[]")
   child_theme_ids(childThemes) {
     if (childThemes) {
-      return childThemes.map(theme => Ember.get(theme, "id"));
+      return childThemes.map(theme => get(theme, "id"));
     }
   },
 
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 039231e897..36043f6096 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
@@ -5,7 +6,7 @@ import showModal from "discourse/lib/show-modal";
 
 export default Route.extend({
   serialize(m) {
-    return { badge_id: Ember.get(m, "id") || "new" };
+    return { badge_id: get(m, "id") || "new" };
   },
 
   model(params) {
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js.es6
index cdb611964e..563c63d0a5 100644
--- a/app/assets/javascripts/admin/routes/admin-user.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import AdminUser from "admin/models/admin-user";
 
@@ -10,7 +11,7 @@ export default DiscourseRoute.extend({
   },
 
   model(params) {
-    return AdminUser.find(Ember.get(params, "user_id"));
+    return AdminUser.find(get(params, "user_id"));
   },
 
   renderTemplate() {
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.es6
index f4b6c740d2..2b70a5e79e 100644
--- 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.es6
@@ -1,10 +1,11 @@
+import { get } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
   model(params) {
     return this.store.findAll(
       "web-hook-event",
-      Ember.get(params, "web_hook_id")
+      get(params, "web_hook_id")
     );
   },
 
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.es6
index 0787886716..dd9780068c 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import DiscourseRoute from "discourse/routes/discourse";
 
@@ -10,7 +11,7 @@ export default DiscourseRoute.extend({
     if (params.web_hook_id === "new") {
       return this.store.createRecord("web-hook");
     }
-    return this.store.find("web-hook", Ember.get(params, "web_hook_id"));
+    return this.store.find("web-hook", get(params, "web_hook_id"));
   },
 
   setupController(controller, model) {
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 907ae24d8c..79d43aa84f 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -1,4 +1,4 @@
-import { get } from "discourse-common/lib/raw-handlebars";
+import { rawGet } from "discourse-common/lib/raw-handlebars";
 
 export function htmlHelper(fn) {
   return Ember.Helper.helper(function(...args) {
@@ -39,7 +39,7 @@ function resolveParams(ctx, options) {
         ) {
           params[k] = hash[k];
         } else if (type === "ID" || type === "PathExpression") {
-          params[k] = get(ctx, hash[k], options);
+          params[k] = rawGet(ctx, hash[k], options);
         }
       });
     } else {
@@ -59,7 +59,7 @@ export function registerUnbound(name, fn) {
         options.types &&
         (options.types[i] === "ID" || options.types[i] === "PathExpression")
       ) {
-        properties[i] = get(this, properties[i], options);
+        properties[i] = rawGet(this, properties[i], options);
       }
     }
 
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 5922fc55c8..78cec47164 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -1,3 +1,5 @@
+import { get } from "@ember/object";
+
 // This is a mechanism for quickly rendering templates which is Ember aware
 // templates are highly compatible with Ember so you don't need to worry about calling "get"
 // and computed properties function, additionally it uses stringParams like Ember does
@@ -24,7 +26,7 @@ RawHandlebars.helpers["get"] = function(context, options) {
     context = context.slice(context.indexOf(".") + 1);
   }
 
-  return val === undefined ? Ember.get(firstContext, context) : val;
+  return val === undefined ? get(firstContext, context) : val;
 };
 
 // adds compatability so this works with stringParams
@@ -45,7 +47,7 @@ RawHandlebars.registerHelper("each", function(
   contextName,
   options
 ) {
-  var list = Ember.get(this, contextName);
+  var list = get(this, contextName);
   var output = [];
   var innerContext = objectCreate(this);
   for (var i = 0; i < list.length; i++) {
@@ -178,7 +180,7 @@ RawHandlebars.get = function(ctx, property, options) {
       ? view.getStream(property).value()
       : view.getAttr(property);
   } else {
-    return Ember.get(ctx, property);
+    return get(ctx, property);
   }
 };
 
@@ -194,7 +196,7 @@ export function compile() {
   return RawHandlebars.compile.apply(this, arguments);
 }
 
-export function get() {
+export function rawGet() {
   return RawHandlebars.get.apply(this, arguments);
 }
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 408922ea8f..199f6374a9 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -11,7 +11,10 @@ var define, requirejs;
         default: Ember.Controller,
         inject: Ember.inject.controller
       },
-      "@ember/object": { default: Ember.Object },
+      "@ember/object": {
+        default: Ember.Object,
+        get: Ember.get
+      },
       "@ember/object/computed": {
         default: Ember.computed,
         alias: Ember.computed.alias,
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index dc8e38eab4..cb6c251355 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
@@ -57,7 +58,7 @@ export default Component.extend({
 
   actions: {
     chooseMessage(message) {
-      const messageId = Ember.get(message, "id");
+      const messageId = get(message, "id");
       this.set("selectedTopicId", messageId);
       next(() => $(`#choose-message-${messageId}`).prop("checked", "true"));
       return false;
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index e8415f3498..11b6cbf20d 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
@@ -35,7 +36,7 @@ export default Component.extend({
 
     if (
       category &&
-      Ember.get(category, "id") ===
+      get(category, "id") ===
         Discourse.Site.currentProp("uncategorized_category_id")
     ) {
       category = null;
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
index a1058c4e3d..6504dc1c08 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { avatarImg } from "discourse/lib/utilities";
@@ -8,6 +9,6 @@ export default htmlHelper((user, size) => {
     return "<div class='avatar-placeholder'></div>";
   }
 
-  const avatarTemplate = Ember.get(user, "avatar_template");
+  const avatarTemplate = get(user, "avatar_template");
   return avatarImg(addExtraUserClasses(user, { size, avatarTemplate }));
 });
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index 7f02dae280..c76382c8df 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,10 +1,9 @@
+import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
-var get = Ember.get,
-  escapeExpression = Handlebars.Utils.escapeExpression;
-
+let escapeExpression = Handlebars.Utils.escapeExpression;
 let _renderer = defaultCategoryLinkRenderer;
 
 export function replaceCategoryLinkRenderer(fn) {
@@ -32,7 +31,7 @@ export function categoryBadgeHTML(category, opts) {
   if (
     !category ||
     (!opts.allowUncategorized &&
-      Ember.get(category, "id") ===
+      get(category, "id") ===
         Discourse.Site.currentProp("uncategorized_category_id") &&
       Discourse.SiteSettings.suppress_uncategorized_badge)
   )
diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js.es6 b/app/assets/javascripts/discourse/helpers/editable-value.js.es6
index 799815590a..131973c0b3 100644
--- a/app/assets/javascripts/discourse/helpers/editable-value.js.es6
+++ b/app/assets/javascripts/discourse/helpers/editable-value.js.es6
@@ -1,10 +1,11 @@
+import { get } from "@ember/object";
 export function formatCurrency([reviewable, fieldId]) {
   // The field `category_id` corresponds to `category`
   if (fieldId === "category_id") {
     fieldId = "category.id";
   }
 
-  let value = Ember.get(reviewable, fieldId);
+  let value = get(reviewable, fieldId);
 
   // If it's an array, say tags, make a copy so we aren't mutating the original
   if (Array.isArray(value)) {
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index ff09e4e2fc..b46a49d6ff 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { avatarImg, formatUsername } from "discourse/lib/utilities";
 
@@ -30,9 +31,9 @@ function renderAvatar(user, options) {
   options = options || {};
 
   if (user) {
-    const name = Ember.get(user, options.namePath || "name");
-    const username = Ember.get(user, options.usernamePath || "username");
-    const avatarTemplate = Ember.get(
+    const name = get(user, options.namePath || "name");
+    const username = get(user, options.usernamePath || "username");
+    const avatarTemplate = get(
       user,
       options.avatarTemplatePath || "avatar_template"
     );
@@ -46,11 +47,11 @@ function renderAvatar(user, options) {
     let title = options.title;
     if (!title && !options.ignoreTitle) {
       // first try to get a title
-      title = Ember.get(user, "title");
+      title = get(user, "title");
       // if there was no title provided
       if (!title) {
         // try to retrieve a description
-        const description = Ember.get(user, "description");
+        const description = get(user, "description");
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
@@ -61,7 +62,7 @@ function renderAvatar(user, options) {
 
     return avatarImg({
       size: options.imageSize,
-      extraClasses: Ember.get(user, "extras") || options.extraClasses,
+      extraClasses: get(user, "extras") || options.extraClasses,
       title: title || displayName,
       avatarTemplate: avatarTemplate
     });
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 26e6d16ef2..9658a959e2 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -463,7 +463,7 @@ class PluginApi {
 
    ```javascript
    api.customUserAvatarClasses(user => {
-      if (Ember.get(user, 'primary_group_name') === 'managers') {
+      if (get(user, 'primary_group_name') === 'managers') {
         return ['managers'];
       }
     });
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 48f78e1ec0..4248f6a8f8 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import computed from "ember-addons/ember-computed-decorators";
@@ -232,15 +233,15 @@ Category.reopenClass({
   slugFor(category, separator = "/") {
     if (!category) return "";
 
-    const parentCategory = Ember.get(category, "parentCategory");
+    const parentCategory = get(category, "parentCategory");
     let result = "";
 
     if (parentCategory) {
       result = Category.slugFor(parentCategory) + separator;
     }
 
-    const id = Ember.get(category, "id"),
-      slug = Ember.get(category, "slug");
+    const id = get(category, "id"),
+      slug = get(category, "slug");
 
     return !slug || slug.trim().length === 0
       ? `${result}${id}-category`
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 0f60c6e737..ae634fbd31 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { or, not, and } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
@@ -882,12 +883,12 @@ export default RestModel.extend({
     than you supplied if the post has already been loaded.
   **/
   storePost(post) {
-    // Calling `Ember.get(undefined)` raises an error
+    // Calling `get(undefined)` raises an error
     if (!post) {
       return;
     }
 
-    const postId = Ember.get(post, "id");
+    const postId = get(post, "id");
     if (postId) {
       const existing = this._identityMap[post.get("id")];
 
@@ -931,7 +932,7 @@ export default RestModel.extend({
         this.set("topic.suggested_topics", result.suggested_topics);
       }
 
-      const posts = Ember.get(result, "post_stream.posts");
+      const posts = get(result, "post_stream.posts");
 
       if (posts) {
         posts.forEach(p => {
@@ -971,7 +972,7 @@ export default RestModel.extend({
         this.set("topic.suggested_topics", result.suggested_topics);
       }
 
-      const posts = Ember.get(result, "post_stream.posts");
+      const posts = get(result, "post_stream.posts");
 
       if (posts) {
         posts.forEach(p => this.storePost(store.createRecord("post", p)));
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 59487da87d..382b369c56 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { equal, and, or, not } from "@ember/object/computed";
 import EmberObject from "@ember/object";
@@ -282,7 +283,7 @@ const Post = RestModel.extend({
         if (key === "reply_to_user" && value && oldValue) {
           skip =
             value.username === oldValue.username ||
-            Ember.get(value, "username") === Ember.get(oldValue, "username");
+            get(value, "username") === get(oldValue, "username");
         }
 
         if (!skip) {
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 6057ece5da..07dc4d72b3 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { alias, sort } from "@ember/object/computed";
 import EmberObject from "@ember/object";
@@ -110,7 +111,7 @@ const Site = RestModel.extend({
 
   updateCategory(newCategory) {
     const categories = this.categories;
-    const categoryId = Ember.get(newCategory, "id");
+    const categoryId = get(newCategory, "id");
     const existingCategory = categories.findBy("id", categoryId);
 
     // Don't update null permissions
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 13476b900e..89eab6119a 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import {
@@ -390,8 +391,8 @@ const TopicTrackingState = Discourse.Model.extend({
       );
     }
 
-    let categoryId = category ? Ember.get(category, "id") : null;
-    let categoryName = category ? Ember.get(category, "name") : null;
+    let categoryId = category ? get(category, "id") : null;
+    let categoryName = category ? get(category, "name") : null;
 
     if (name === "new") {
       return this.countNew(categoryId);
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index a4940d2c0a..b7614afddf 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,3 +1,4 @@
+import { 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";
@@ -378,7 +379,7 @@ const Topic = RestModel.extend({
     this.set("bookmarking", true);
 
     const stream = this.postStream;
-    const posts = Ember.get(stream, "posts");
+    const posts = get(stream, "posts");
     const firstPost =
       posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.bookmarked;
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 77a8c600cd..86b35b6534 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export function buildGroupPage(type) {
@@ -9,7 +10,7 @@ export function buildGroupPage(type) {
     },
 
     model(params, transition) {
-      let categoryId = Ember.get(transition.to, "queryParams.category_id");
+      let categoryId = get(transition.to, "queryParams.category_id");
       return this.modelFor("group").findPosts({ type, categoryId });
     },
 
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 60bc266f00..a6f3eba69a 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { cancel } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
@@ -215,9 +216,9 @@ const TopicRoute = DiscourseRoute.extend({
 
   setupParams(topic, params) {
     const postStream = topic.get("postStream");
-    postStream.set("summary", Ember.get(params, "filter") === "summary");
+    postStream.set("summary", get(params, "filter") === "summary");
 
-    const usernames = Ember.get(params, "username_filters"),
+    const usernames = get(params, "username_filters"),
       userFilters = postStream.get("userFilters");
 
     userFilters.clear();
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js.es6
index dba599c690..641e35e482 100644
--- a/app/assets/javascripts/discourse/services/search.js.es6
+++ b/app/assets/javascripts/discourse/services/search.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import EmberObject from "@ember/object";
 import {
   default as computed,
@@ -19,7 +20,7 @@ export default EmberObject.extend({
   contextType: {
     get(searchContext) {
       if (searchContext) {
-        return Ember.get(searchContext, "type");
+        return get(searchContext, "type");
       }
     },
     set(value, searchContext) {
diff --git a/app/assets/javascripts/discourse/services/theme-settings.js.es6 b/app/assets/javascripts/discourse/services/theme-settings.js.es6
index 5ebe9f3705..032024b56b 100644
--- a/app/assets/javascripts/discourse/services/theme-settings.js.es6
+++ b/app/assets/javascripts/discourse/services/theme-settings.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import Service from "@ember/service";
 
 export default Service.extend({
@@ -14,7 +15,7 @@ export default Service.extend({
 
   getSetting(themeId, settingsKey) {
     if (this._settings[themeId]) {
-      return Ember.get(this._settings[themeId], settingsKey);
+      return get(this._settings[themeId], settingsKey);
     }
     return null;
   },
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 02fd704dca..c86931260b 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { schedule } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
@@ -558,7 +559,7 @@ export default createWidget("header", {
     if (service) {
       const ctx = service.get("searchContext");
       if (ctx) {
-        return Ember.get(ctx, "type");
+        return get(ctx, "type");
       }
     }
   }
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
index c546c59c55..de2ea2ac42 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { searchContextDescription } from "discourse/lib/search";
 import { h } from "virtual-dom";
 import { createWidget } from "discourse/widgets/widget";
@@ -52,8 +53,8 @@ createWidget("search-context", {
     const result = [];
     if (ctx) {
       const description = searchContextDescription(
-        Ember.get(ctx, "type"),
-        Ember.get(ctx, "user.username") || Ember.get(ctx, "category.name")
+        get(ctx, "type"),
+        get(ctx, "user.username") || get(ctx, "category.name")
       );
       result.push(
         h("label", [
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 1bd428a835..5c3b3e08b1 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { debounce } from "@ember/runloop";
 import { later } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -99,7 +100,7 @@ export default createWidget("search-menu", {
     const contextEnabled = searchData.contextEnabled;
 
     const ctx = contextEnabled ? this.searchContext() : null;
-    const type = ctx ? Ember.get(ctx, "type") : null;
+    const type = ctx ? get(ctx, "type") : null;
 
     let url = "/search";
     const params = [];
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index b53e8ea2a8..17e138e361 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { makeArray } from "discourse/lib/utilities";
 import MultiSelectComponent from "select-kit/components/multi-select";
 import Category from "discourse/models/category";
@@ -39,7 +40,7 @@ export default MultiSelectComponent.extend({
   filterComputedContent(computedContent, computedValues, filter) {
     const regex = new RegExp(filter, "i");
     return computedContent.filter(category =>
-      this._normalize(Ember.get(category, "name")).match(regex)
+      this._normalize(get(category, "name")).match(regex)
     );
   },
 
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.es6
index bfd9a44af8..1e6d4ebe74 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -1,3 +1,5 @@
+import { isEmpty } from "@ember/utils";
+import { get } from "@ember/object";
 import { makeArray } from "discourse/lib/utilities";
 import Category from "discourse/models/category";
 import ComboBox from "select-kit/components/combo-box";
@@ -6,7 +8,6 @@ import { default as computed } from "ember-addons/ember-computed-decorators";
 import renderTag from "discourse/lib/render-tag";
 import { escapeExpression } from "discourse/lib/utilities";
 import { iconHTML } from "discourse-common/lib/icon-library";
-const { get, isEmpty, run } = Ember;
 
 export default ComboBox.extend(TagsMixin, {
   allowContentReplacement: true,
@@ -168,9 +169,7 @@ export default ComboBox.extend(TagsMixin, {
   computeHeaderContent() {
     let content = this._super(...arguments);
 
-    const joinedTags = this.selection
-      .map(s => Ember.get(s, "value"))
-      .join(", ");
+    const joinedTags = this.selection.map(s => get(s, "value")).join(", ");
 
     if (isEmpty(this.selection)) {
       content.label = I18n.t("tagging.choose_for_topic");
@@ -198,7 +197,7 @@ export default ComboBox.extend(TagsMixin, {
 
     if (this.selection) {
       data.selected_tags = this.selection
-        .map(s => Ember.get(s, "value"))
+        .map(s => get(s, "value"))
         .slice(0, 100);
     }
 
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index b43c2542d0..d369445c9c 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,3 +1,4 @@
+import { get } from "@ember/object";
 import { makeArray } from "discourse/lib/utilities";
 import { isEmpty } from "@ember/utils";
 import { throttle } from "@ember/runloop";
@@ -298,7 +299,7 @@ export default Mixin.create({
         .slice()
         .reverse()
         .some(selection => {
-          if (!Ember.get(selection, "locked")) {
+          if (!get(selection, "locked")) {
             this.highlightSelection(selection);
             return true;
           }

From 4e07f725c67d56f5508ed621e62d6067ec8b9f77 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 Nov 2019 09:30:44 -0400
Subject: [PATCH 279/328] Remove debug info

---
 app/helpers/application_helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 383aca79aa..96531a9a18 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -442,7 +442,6 @@ module ApplicationHelper
       ids = theme_ids
     end
 
-    Rails.logger.info "0 >>>>>> #{name}"
     Stylesheet::Manager.stylesheet_link_tag(name, 'all', ids)
   end
 

From 785ebb674da9adfe5d7249e58473d2efed6eb17f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 Nov 2019 11:01:16 -0400
Subject: [PATCH 280/328] REFACTOR: Split off raw handlebars helpers from
 compiler

This allows us to compile without Ember being present
---
 .../discourse-common/lib/helpers.js.es6       | 13 +++-
 .../lib/raw-handlebars-helpers.js.es6         | 44 +++++++++++
 .../lib/raw-handlebars.js.es6                 | 76 +------------------
 .../initializers/auto-load-modules.js.es6     |  3 +
 lib/freedom_patches/raw_handlebars.rb         | 24 +++---
 5 files changed, 73 insertions(+), 87 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6

diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 79d43aa84f..1ed602b468 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -1,4 +1,4 @@
-import { rawGet } from "discourse-common/lib/raw-handlebars";
+import { get } from "@ember/object";
 
 export function htmlHelper(fn) {
   return Ember.Helper.helper(function(...args) {
@@ -10,6 +10,17 @@ export function htmlHelper(fn) {
 
 const _helpers = {};
 
+function rawGet(ctx, property, options) {
+  if (options.types && options.data.view) {
+    var view = options.data.view;
+    return view.getStream
+      ? view.getStream(property).value()
+      : view.getAttr(property);
+  } else {
+    return get(ctx, property);
+  }
+}
+
 export function registerHelper(name, fn) {
   _helpers[name] = Ember.Helper.helper(fn);
 }
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.es6
new file mode 100644
index 0000000000..432ce98853
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6
@@ -0,0 +1,44 @@
+import { get } from "@ember/object";
+
+export function registerRawHelpers(hbs, handlebarsClass) {
+  hbs.helper = function() {};
+  hbs.helpers = Object.create(handlebarsClass.helpers);
+
+  hbs.helpers["get"] = function(context, options) {
+    var firstContext = options.contexts[0];
+    var val = firstContext[context];
+
+    if (context.indexOf("controller.") === 0) {
+      context = context.slice(context.indexOf(".") + 1);
+    }
+
+    return val === undefined ? get(firstContext, context) : val;
+  };
+
+  // #each .. in support (as format is transformed to this)
+  hbs.registerHelper("each", function(
+    localName,
+    inKeyword,
+    contextName,
+    options
+  ) {
+    var list = get(this, contextName);
+    var output = [];
+    var innerContext = Object.create(this);
+    for (var i = 0; i < list.length; i++) {
+      innerContext[localName] = list[i];
+      output.push(options.fn(innerContext));
+    }
+    return output.join("");
+  });
+
+  function stringCompatHelper(fn) {
+    const old = hbs.helpers[fn];
+    hbs.helpers[fn] = function(context, options) {
+      return old.apply(this, [hbs.helpers.get(context, options), options]);
+    };
+  }
+  stringCompatHelper("if");
+  stringCompatHelper("unless");
+  stringCompatHelper("with");
+}
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 78cec47164..eed8ec09a0 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -1,66 +1,9 @@
-import { get } from "@ember/object";
-
 // This is a mechanism for quickly rendering templates which is Ember aware
 // templates are highly compatible with Ember so you don't need to worry about calling "get"
 // and computed properties function, additionally it uses stringParams like Ember does
 
-// compat with ie8 in case this gets picked up elsewhere
-const objectCreate =
-  Object.create ||
-  function(parent) {
-    function F() {}
-    F.prototype = parent;
-    return new F();
-  };
-
 const RawHandlebars = Handlebars.create();
 
-RawHandlebars.helper = function() {};
-RawHandlebars.helpers = objectCreate(Handlebars.helpers);
-
-RawHandlebars.helpers["get"] = function(context, options) {
-  var firstContext = options.contexts[0];
-  var val = firstContext[context];
-
-  if (context.indexOf("controller.") === 0) {
-    context = context.slice(context.indexOf(".") + 1);
-  }
-
-  return val === undefined ? get(firstContext, context) : val;
-};
-
-// adds compatability so this works with stringParams
-function stringCompatHelper(fn) {
-  const old = RawHandlebars.helpers[fn];
-  RawHandlebars.helpers[fn] = function(context, options) {
-    return old.apply(this, [
-      RawHandlebars.helpers.get(context, options),
-      options
-    ]);
-  };
-}
-
-// #each .. in support (as format is transformed to this)
-RawHandlebars.registerHelper("each", function(
-  localName,
-  inKeyword,
-  contextName,
-  options
-) {
-  var list = get(this, contextName);
-  var output = [];
-  var innerContext = objectCreate(this);
-  for (var i = 0; i < list.length; i++) {
-    innerContext[localName] = list[i];
-    output.push(options.fn(innerContext));
-  }
-  return output.join("");
-});
-
-stringCompatHelper("if");
-stringCompatHelper("unless");
-stringCompatHelper("with");
-
 function buildPath(blk, args) {
   var result = {
     type: "PathExpression",
@@ -115,14 +58,14 @@ function replaceGet(ast) {
 
 if (Handlebars.Compiler) {
   RawHandlebars.Compiler = function() {};
-  RawHandlebars.Compiler.prototype = objectCreate(
+  RawHandlebars.Compiler.prototype = Object.create(
     Handlebars.Compiler.prototype
   );
   RawHandlebars.Compiler.prototype.compiler = RawHandlebars.Compiler;
 
   RawHandlebars.JavaScriptCompiler = function() {};
 
-  RawHandlebars.JavaScriptCompiler.prototype = objectCreate(
+  RawHandlebars.JavaScriptCompiler.prototype = Object.create(
     Handlebars.JavaScriptCompiler.prototype
   );
   RawHandlebars.JavaScriptCompiler.prototype.compiler =
@@ -173,17 +116,6 @@ if (Handlebars.Compiler) {
   };
 }
 
-RawHandlebars.get = function(ctx, property, options) {
-  if (options.types && options.data.view) {
-    var view = options.data.view;
-    return view.getStream
-      ? view.getStream(property).value()
-      : view.getAttr(property);
-  } else {
-    return get(ctx, property);
-  }
-};
-
 export function template() {
   return RawHandlebars.template.apply(this, arguments);
 }
@@ -196,8 +128,4 @@ export function compile() {
   return RawHandlebars.compile.apply(this, arguments);
 }
 
-export function rawGet() {
-  return RawHandlebars.get.apply(this, arguments);
-}
-
 export default RawHandlebars;
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
index ae3c15e420..3e1505a5dd 100644
--- a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -1,4 +1,6 @@
 import { registerHelpers } from "discourse-common/lib/helpers";
+import RawHandlebars from "discourse-common/lib/raw-handlebars";
+import { registerRawHelpers } from "discourse-common/lib/raw-handlebars-helpers";
 
 export function autoLoadModules(container, registry) {
   Object.keys(requirejs.entries).forEach(entry => {
@@ -10,6 +12,7 @@ export function autoLoadModules(container, registry) {
     }
   });
   registerHelpers(registry);
+  registerRawHelpers(RawHandlebars, Handlebars);
 }
 
 export default {
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index acb63c8cd3..d607a3c46f 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -18,19 +18,19 @@ class Barber::Precompiler
       # very hacky but lets us use ES6. I'm ashamed of this code -RW
       transpiled = transpiled[0...transpiled.index('export ')]
 
-      @precompiler = StringIO.new <<END
-      var __RawHandlebars;
-      (function() {
-        #{transpiled};
-        __RawHandlebars = RawHandlebars;
-      })();
+      @precompiler = StringIO.new <<~END
+        var __RawHandlebars;
+        (function() {
+          #{transpiled};
+          __RawHandlebars = RawHandlebars;
+        })();
 
-      Barber = {
-        precompile: function(string) {
-          return __RawHandlebars.precompile(string, false).toString();
-        }
-      };
-END
+        Barber = {
+          precompile: function(string) {
+            return __RawHandlebars.precompile(string, false).toString();
+          }
+        };
+      END
     end
 
     @precompiler

From 75b751c108cf47462a3df946f5af4874b62d2c0a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 Nov 2019 11:03:18 -0400
Subject: [PATCH 281/328] REFACTOR: An ember.get we missed

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

diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index aeab2d45fa..e03a9d7ed7 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -1,9 +1,9 @@
 import { findHelper } from "discourse-common/lib/helpers";
+import { get } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
 /* global requirejs, require */
 var classify = Ember.String.classify;
-var get = Ember.get;
 
 const _options = {};
 

From 6300ac699a69f4cc6ac954b26df63c63c61c033c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 Nov 2019 12:46:41 -0400
Subject: [PATCH 282/328] FIX: Missing `run` import

---
 .../components/mini-tag-chooser.js.es6        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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.es6
index 1e6d4ebe74..fce15e2f00 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -1,13 +1,13 @@
-import { isEmpty } from "@ember/utils";
-import { get } from "@ember/object";
-import { makeArray } from "discourse/lib/utilities";
 import Category from "discourse/models/category";
 import ComboBox from "select-kit/components/combo-box";
 import TagsMixin from "select-kit/mixins/tags";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import renderTag from "discourse/lib/render-tag";
-import { escapeExpression } from "discourse/lib/utilities";
+import { escapeExpression, makeArray } from "discourse/lib/utilities";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { get } from "@ember/object";
+import { isEmpty } from "@ember/utils";
+import { debounce } from "@ember/runloop";
 
 export default ComboBox.extend(TagsMixin, {
   allowContentReplacement: true,
@@ -169,7 +169,9 @@ export default ComboBox.extend(TagsMixin, {
   computeHeaderContent() {
     let content = this._super(...arguments);
 
-    const joinedTags = this.selection.map(s => get(s, "value")).join(", ");
+    const joinedTags = this.selection
+      .map(s => Ember.get(s, "value"))
+      .join(", ");
 
     if (isEmpty(this.selection)) {
       content.label = I18n.t("tagging.choose_for_topic");
@@ -197,7 +199,7 @@ export default ComboBox.extend(TagsMixin, {
 
     if (this.selection) {
       data.selected_tags = this.selection
-        .map(s => get(s, "value"))
+        .map(s => Ember.get(s, "value"))
         .slice(0, 100);
     }
 
@@ -237,7 +239,7 @@ export default ComboBox.extend(TagsMixin, {
 
     this.set(
       "searchDebounce",
-      run.debounce(this, this._prepareSearch, this.filter, 350)
+      debounce(this, this._prepareSearch, this.filter, 350)
     );
   },
 
@@ -270,7 +272,7 @@ export default ComboBox.extend(TagsMixin, {
       if (isEmpty(this.collectionComputedContent)) {
         this.set(
           "searchDebounce",
-          run.debounce(this, this._prepareSearch, this.filter, 350)
+          debounce(this, this._prepareSearch, this.filter, 350)
         );
       }
     },
@@ -282,7 +284,7 @@ export default ComboBox.extend(TagsMixin, {
       filter = isEmpty(filter) ? null : filter;
       this.set(
         "searchDebounce",
-        run.debounce(this, this._prepareSearch, filter, 350)
+        debounce(this, this._prepareSearch, filter, 350)
       );
     }
   }

From dceb72bc69cd1df03f48867febb0e0531f72bc8f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 Nov 2019 13:06:50 -0400
Subject: [PATCH 283/328] FIX: Move `makeArray` to discourse-common

---
 .../javascripts/admin/components/admin-report-chart.js.es6 | 2 +-
 .../admin/components/admin-report-stacked-chart.js.es6     | 2 +-
 .../javascripts/admin/components/admin-report-table.js.es6 | 2 +-
 .../javascripts/admin/components/admin-report.js.es6       | 2 +-
 app/assets/javascripts/admin/components/value-list.js.es6  | 2 +-
 .../admin/controllers/admin-customize-themes-show.js.es6   | 2 +-
 .../admin/controllers/admin-dashboard-general.js.es6       | 2 +-
 app/assets/javascripts/admin/models/report.js.es6          | 2 +-
 app/assets/javascripts/discourse-common/lib/helpers.js.es6 | 7 +++++++
 app/assets/javascripts/discourse/lib/utilities.js.es6      | 7 -------
 .../discourse/widgets/private-message-map.js.es6           | 2 +-
 .../select-kit/components/category-selector.js.es6         | 2 +-
 .../select-kit/components/mini-tag-chooser.js.es6          | 3 ++-
 .../components/multi-select/multi-select-header.js.es6     | 2 +-
 .../javascripts/select-kit/components/tag-chooser.js.es6   | 2 +-
 .../javascripts/select-kit/components/tag-drop.js.es6      | 2 +-
 app/assets/javascripts/select-kit/mixins/events.js.es6     | 2 +-
 17 files changed, 23 insertions(+), 22 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 a64a2e3479..172fec1780 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { debounce } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
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 d233d131e2..99d4e7ceb6 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,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { debounce } from "@ember/runloop";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js.es6
index 7cba55bf3a..38e00c8ab8 100644
--- a/app/assets/javascripts/admin/components/admin-report-table.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-table.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index d7ddfc2151..db06feecfc 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6
index 5ab15aa63e..31ef93932e 100644
--- a/app/assets/javascripts/admin/components/value-list.js.es6
+++ b/app/assets/javascripts/admin/components/value-list.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { empty, alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
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.es6
index c554586f6a..d4622e21d8 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { empty, notEmpty, match } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
index da78555f07..727b6d717d 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index 4416e1e9f3..37c495e06f 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { escapeExpression } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 1ed602b468..17bdee941d 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -1,5 +1,12 @@
 import { get } from "@ember/object";
 
+export function makeArray(obj) {
+  if (obj === null || obj === undefined) {
+    return [];
+  }
+  return Array.isArray(obj) ? obj : [obj];
+}
+
 export function htmlHelper(fn) {
   return Ember.Helper.helper(function(...args) {
     args =
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index eac6471bc7..599c3a4965 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -3,13 +3,6 @@ import toMarkdown from "discourse/lib/to-markdown";
 
 const homepageSelector = "meta[name=discourse_current_homepage]";
 
-export function makeArray(obj) {
-  if (obj === null || obj === undefined) {
-    return [];
-  }
-  return Array.isArray(obj) ? obj : [obj];
-}
-
 export function translateSize(size) {
   switch (size) {
     case "tiny":
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
index 02a4ae32d1..62be57b150 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { avatarFor, avatarImg } from "discourse/widgets/post";
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index 17e138e361..f000f00782 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import MultiSelectComponent from "select-kit/components/multi-select";
 import Category from "discourse/models/category";
 
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.es6
index fce15e2f00..c32e15e19a 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -3,7 +3,8 @@ import ComboBox from "select-kit/components/combo-box";
 import TagsMixin from "select-kit/mixins/tags";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import renderTag from "discourse/lib/render-tag";
-import { escapeExpression, makeArray } from "discourse/lib/utilities";
+import { escapeExpression } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
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.es6
index e53746cbfe..b16ed0c290 100644
--- 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.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { on } from "ember-addons/ember-computed-decorators";
 import computed from "ember-addons/ember-computed-decorators";
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
index b218df9a25..3e92b80a88 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -2,7 +2,7 @@ import MultiSelectComponent from "select-kit/components/multi-select";
 import TagsMixin from "select-kit/mixins/tags";
 import renderTag from "discourse/lib/render-tag";
 import computed from "ember-addons/ember-computed-decorators";
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 const { get, run } = Ember;
 
 export default MultiSelectComponent.extend(TagsMixin, {
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index d173c60bb0..66958c3452 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -1,4 +1,4 @@
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import ComboBoxComponent from "select-kit/components/combo-box";
 import DiscourseURL from "discourse/lib/url";
 import TagsMixin from "select-kit/mixins/tags";
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index d369445c9c..739d0925e3 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { makeArray } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { isEmpty } from "@ember/utils";
 import { throttle } from "@ember/runloop";
 import { schedule } from "@ember/runloop";

From 0e2261c414c54fcb2445fae8106b3f7b0250d385 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 Nov 2019 13:57:22 -0400
Subject: [PATCH 284/328] FIX: Linting

---
 .../javascripts/admin/components/admin-report-chart.js.es6  | 4 +---
 .../admin/components/admin-report-stacked-chart.js.es6      | 4 +---
 .../admin/controllers/admin-dashboard-general.js.es6        | 4 +---
 .../admin/controllers/modals/admin-silence-user.js.es6      | 4 +---
 .../admin/controllers/modals/admin-suspend-user.js.es6      | 4 +---
 .../admin/routes/admin-web-hooks-show-events.js.es6         | 5 +----
 .../javascripts/admin/routes/admin-web-hooks-show.js.es6    | 5 +----
 .../discourse/components/future-date-input.js.es6           | 5 +----
 .../javascripts/discourse/components/invite-panel.js.es6    | 6 +-----
 .../discourse/components/user-card-contents.js.es6          | 4 +---
 .../javascripts/discourse/controllers/move-to-topic.js.es6  | 4 +---
 app/assets/javascripts/discourse/controllers/user.js.es6    | 4 +---
 .../javascripts/discourse/mixins/name-validation.js.es6     | 5 +----
 app/assets/javascripts/discourse/models/user.js.es6         | 5 +----
 14 files changed, 14 insertions(+), 49 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 172fec1780..f55288d9d2 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -50,9 +50,7 @@ export default Component.extend({
     if (!chartCanvas) return;
 
     const context = chartCanvas.getContext("2d");
-    const chartData = makeArray(
-      model.get("chartData") || model.get("data")
-    );
+    const chartData = makeArray(model.get("chartData") || model.get("data"));
     const prevChartData = makeArray(
       model.get("prevChartData") || model.get("prev_data")
     );
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 99d4e7ceb6..f28a2b348d 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
@@ -53,9 +53,7 @@ export default Component.extend({
 
     const context = chartCanvas.getContext("2d");
 
-    const chartData = makeArray(
-      model.get("chartData") || model.get("data")
-    );
+    const chartData = makeArray(model.get("chartData") || model.get("data"));
 
     const data = {
       labels: chartData[0].data.map(cd => cd.x),
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
index 727b6d717d..24884b0ba6 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
@@ -9,9 +9,7 @@ import PeriodComputationMixin from "admin/mixins/period-computation";
 
 function staticReport(reportType) {
   return Ember.computed("reports.[]", function() {
-    return makeArray(this.reports).find(
-      report => report.type === reportType
-    );
+    return makeArray(this.reports).find(report => report.type === reportType);
   });
 }
 
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.es6
index a64416f2ef..5c04066941 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
@@ -14,9 +14,7 @@ export default Controller.extend(PenaltyController, {
 
   @computed("silenceUntil", "reason", "silencing")
   submitDisabled(silenceUntil, reason, silencing) {
-    return (
-      silencing || isEmpty(silenceUntil) || !reason || reason.length < 1
-    );
+    return silencing || isEmpty(silenceUntil) || !reason || reason.length < 1;
   },
 
   actions: {
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.es6
index 6a558b2130..c5afea9d88 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
@@ -14,9 +14,7 @@ export default Controller.extend(PenaltyController, {
 
   @computed("suspendUntil", "reason", "suspending")
   submitDisabled(suspendUntil, reason, suspending) {
-    return (
-      suspending || isEmpty(suspendUntil) || !reason || reason.length < 1
-    );
+    return suspending || isEmpty(suspendUntil) || !reason || reason.length < 1;
   },
 
   actions: {
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.es6
index 2b70a5e79e..64f28d3652 100644
--- 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.es6
@@ -3,10 +3,7 @@ import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
   model(params) {
-    return this.store.findAll(
-      "web-hook-event",
-      get(params, "web_hook_id")
-    );
+    return this.store.findAll("web-hook-event", get(params, "web_hook_id"));
   },
 
   setupController(controller, model) {
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.es6
index dd9780068c..34aed775cc 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -15,10 +15,7 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    if (
-      model.get("isNew") ||
-      isEmpty(model.get("web_hook_event_types"))
-    ) {
+    if (model.get("isNew") || isEmpty(model.get("web_hook_event_types"))) {
       model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }
 
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
index dbec3977f6..8746cfb0ef 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -107,10 +107,7 @@ export default Component.extend({
   ) {
     if (!statusType || willCloseImmediately) return false;
 
-    if (
-      statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE &&
-      isEmpty(categoryId)
-    ) {
+    if (statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE && isEmpty(categoryId)) {
       return false;
     }
 
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index aece374581..b1743d4f99 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -64,11 +64,7 @@ export default Component.extend({
     }
 
     // when inviting to private topic via email, group name must be specified
-    if (
-      isPrivateTopic &&
-      isEmpty(groupNames) &&
-      emailValid(emailTrimmed)
-    ) {
+    if (isPrivateTopic && isEmpty(groupNames) && emailValid(emailTrimmed)) {
       return true;
     }
 
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 b5fd1a4557..1416d39bc4 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -78,9 +78,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
         .map(field => {
           Ember.set(field, "dasherized_name", field.get("name").dasherize());
           const value = userFields ? userFields[field.get("id")] : null;
-          return isEmpty(value)
-            ? null
-            : EmberObject.create({ value, field });
+          return isEmpty(value) ? null : EmberObject.create({ value, field });
         })
         .compact();
     }
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index 3b731a23a5..c8934801cb 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -48,9 +48,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @computed("saving", "selectedTopicId", "topicName")
   buttonDisabled(saving, selectedTopicId, topicName) {
-    return (
-      saving || (isEmpty(selectedTopicId) && isEmpty(topicName))
-    );
+    return saving || (isEmpty(selectedTopicId) && isEmpty(topicName));
   },
 
   @computed(
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index f7aa3c10da..ac48062e8c 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -119,9 +119,7 @@ export default Controller.extend(CanCheckEmails, {
           const value = userFields
             ? userFields[field.get("id").toString()]
             : null;
-          return isEmpty(value)
-            ? null
-            : EmberObject.create({ value, field });
+          return isEmpty(value) ? null : EmberObject.create({ value, field });
         })
         .compact();
     }
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
index 0cf4c796cb..46f1b4dfae 100644
--- a/app/assets/javascripts/discourse/mixins/name-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
@@ -16,10 +16,7 @@ export default Mixin.create({
   // Validate the name.
   @computed("accountName")
   nameValidation() {
-    if (
-      this.siteSettings.full_name_required &&
-      isEmpty(this.accountName)
-    ) {
+    if (this.siteSettings.full_name_required && isEmpty(this.accountName)) {
       return InputValidation.create({ failed: true });
     }
 
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index e20a29f379..b3148b4c0c 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -95,10 +95,7 @@ const User = RestModel.extend({
 
   @computed("profile_background_upload_url")
   profileBackgroundUrl(bgUrl) {
-    if (
-      isEmpty(bgUrl) ||
-      !Discourse.SiteSettings.allow_profile_backgrounds
-    ) {
+    if (isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) {
       return "".htmlSafe();
     }
     return (

From 66e0bdc053f32380fee601caa61cfbe197576294 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 1 Nov 2019 14:19:10 -0500
Subject: [PATCH 285/328] FEATURE: Create New Topic button on embed with params
 (#8280)

* FEATURE: Create New Topic button on embed with params
---
 app/assets/stylesheets/embed.scss   | 27 +++++++++++++++++++++++++++
 app/controllers/embed_controller.rb |  9 +++++++++
 app/views/embed/topics.html.erb     |  8 ++++++++
 config/locales/server.en.yml        |  1 +
 4 files changed, 45 insertions(+)

diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index c4c7046463..d0acdb1e6f 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -3,6 +3,7 @@
 @import "./common/foundation/variables";
 @import "./common/foundation/colors";
 @import "./common/foundation/mixins";
+@import "./common/components/buttons";
 
 article.post {
   border-bottom: 1px solid #ddd;
@@ -176,6 +177,32 @@ div.lightbox-wrapper {
   margin-bottom: 20px;
 }
 
+.new-topic-btn {
+  margin: 0.5rem;
+
+  &:hover {
+    background: #006da3;
+  }
+
+  span {
+    display: inline-block;
+    vertical-align: middle;
+    padding-bottom: 2px;
+  }
+
+  .new-topic-btn__icon {
+    width: 16px;
+    height: 16px;
+    margin-right: 2px;
+    background-image: svg-uri(
+      '<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 448 512" fill="white"><path d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"></path></svg>'
+    );
+    background-repeat: no-repeat;
+    background-size: 100%;
+    background-position: top center;
+  }
+}
+
 .topics-list {
   width: 100%;
 
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 0d8f53eed2..04e6a2ec89 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -42,6 +42,15 @@ class EmbedController < ApplicationController
 
     list_options = build_topic_list_options
     list_options[:per_page] = params[:per_page].to_i if params.has_key?(:per_page)
+
+    if params[:allow_create]
+      @allow_create = true
+      create_url_params = {}
+      create_url_params[:category_id] = params[:category] if params[:category].present?
+      create_url_params[:tags] = params[:tags] if params[:tags].present?
+      @create_url = "#{Discourse.base_url}/new-topic?#{create_url_params.to_query}"
+    end
+
     topic_query = TopicQuery.new(current_user, list_options)
     @list = topic_query.list_latest
   end
diff --git a/app/views/embed/topics.html.erb b/app/views/embed/topics.html.erb
index 2aaf326796..10b825f727 100644
--- a/app/views/embed/topics.html.erb
+++ b/app/views/embed/topics.html.erb
@@ -1,4 +1,12 @@
 <%- if @list && @list.topics.present? %>
+  <%- if @allow_create %>
+    <%= link_to @create_url, target: "_blank" do |link| %>
+      <button class="new-topic-btn btn btn-primary">
+        <span class="new-topic-btn__icon"></span>
+        <span class="new-topic-btn__text"><%= I18n.t('embed.new_topic') %></span>
+      </button>
+    <%- end %>
+  <%- end %>
   <div class='topics-list' data-embed-state='loaded' <%- if @embed_id %>data-embed-id="<%= @embed_id %>"<%- end %>>
     <%- @list.topics.each do |t| %>
       <div class='topic-list-item'>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c7e926513a..bc323fbb77 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -296,6 +296,7 @@ en:
       other: "%{count} likes"
     last_reply: "Last reply"
     created: "Created"
+    new_topic: "Create new topic"
 
   no_mentions_allowed: "Sorry, you can't mention other users."
   too_many_mentions:

From 29ee467a0466d228d50f33d2e6a27976ca40b80b Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 1 Nov 2019 22:39:59 -0700
Subject: [PATCH 286/328] FIX: do not add personal message link in user menu if
 they are disabled

---
 .../discourse/widgets/quick-access-profile.js.es6 | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
index 4fc9140b3f..761ebf085f 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
@@ -29,7 +29,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
   },
 
   _getDefaultItems() {
-    return [
+    let defaultItems = [
       {
         icon: "user",
         href: `${this.attrs.path}/summary`,
@@ -39,12 +39,16 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
         icon: "stream",
         href: `${this.attrs.path}/activity`,
         content: I18n.t("user.activity_stream")
-      },
-      {
+      }
+    ];
+    if (this.siteSettings.enable_personal_messages) {
+      defaultItems.push({
         icon: "envelope",
         href: `${this.attrs.path}/messages`,
         content: I18n.t("user.private_messages")
-      },
+      });
+    }
+    defaultItems.push(
       {
         icon: "pencil",
         href: `${this.attrs.path}/activity/drafts`,
@@ -55,7 +59,8 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
         href: `${this.attrs.path}/preferences`,
         content: I18n.t("user.preferences")
       }
-    ];
+    );
+    return defaultItems;
   },
 
   _toggleAnonymousButton() {

From 200cef90ea2324f529102fc76fb692b4af5fe6c7 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 1 Nov 2019 16:21:10 +0000
Subject: [PATCH 287/328] FIX: TopicQuery doesn't react well to subcategories
 without definitions

Also:

Move includes call higher which makes it possible to run all of the
intermediate queries for easier debugging.

Add tests for TagsController with categories in the path.
---
 lib/topic_query.rb                    |  6 +--
 spec/requests/tags_controller_spec.rb | 66 +++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 5060180889..8a2c4637f3 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -663,7 +663,7 @@ class TopicQuery
     options[:visible] = false if @user && @user.id == options[:filtered_to_user]
 
     # Start with a list of all topics
-    result = Topic.unscoped
+    result = Topic.unscoped.includes(:category)
 
     if @user
       result = result.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})")
@@ -683,7 +683,7 @@ class TopicQuery
               SELECT :category_id
             ) AND
             topics.id NOT IN (
-              SELECT c3.topic_id FROM categories c3 WHERE c3.parent_category_id = :category_id
+              SELECT c3.topic_id FROM categories c3 WHERE c3.parent_category_id = :category_id AND c3.topic_id IS NOT NULL
             )
           SQL
         result = result.where(sql, category_id: category_id)
@@ -753,7 +753,7 @@ class TopicQuery
     end
 
     result = apply_ordering(result, options)
-    result = result.listable_topics.includes(:category)
+    result = result.listable_topics
 
     if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0
       result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids].map(&:to_i)).references(:categories)
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index f1b0d3a2f2..500988cf19 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -90,6 +90,72 @@ describe TagsController do
       get "/tags/test"
       expect(response.status).to eq(200)
     end
+
+    context "with a category in the path" do
+      fab!(:topic_in_category) {
+        Fabricate(
+          :topic,
+          tags: [tag],
+          category: category
+        )
+      }
+
+      fab!(:topic_in_category_without_tag) {
+        Fabricate(
+          :topic,
+          category: category
+        )
+      }
+
+      fab!(:topic_out_of_category) {
+        Fabricate(
+          :topic,
+          tags: [tag]
+        )
+      }
+
+      it "should produce the topic inside the category and not the topic outside of it" do
+        get "/tags/c/#{category.slug}/#{tag.name}.json"
+
+        topic_ids = json['topic_list']['topics'].map { |x| x['id'] }
+        expect(topic_ids).to include(topic_in_category.id)
+        expect(topic_ids).to_not include(topic_out_of_category.id)
+        expect(topic_ids).to_not include(topic_in_category_without_tag.id)
+      end
+    end
+
+    context "with a subcategory in the path" do
+      fab!(:topic_in_subcategory) {
+        Fabricate(
+          :topic,
+          tags: [tag],
+          category: subcategory
+        )
+      }
+
+      fab!(:topic_in_subcategory_without_tag) {
+        Fabricate(
+          :topic,
+          category: subcategory
+        )
+      }
+
+      fab!(:topic_out_of_subcategory) {
+        Fabricate(
+          :topic,
+          tags: [tag]
+        )
+      }
+
+      it "should produce the topic inside the subcategory and not the topic outside of it" do
+        get "/tags/c/#{category.slug}/#{subcategory.slug}/#{tag.name}.json"
+
+        topic_ids = json['topic_list']['topics'].map { |x| x['id'] }
+        expect(topic_ids).to include(topic_in_subcategory.id)
+        expect(topic_ids).to_not include(topic_out_of_subcategory.id)
+        expect(topic_ids).to_not include(topic_in_subcategory_without_tag.id)
+      end
+    end
   end
 
   describe '#check_hashtag' do

From af65809ec6a7c01305cc571e06206465a702968e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 2 Nov 2019 12:01:24 +0100
Subject: [PATCH 288/328] FIX: ensures menu panel is not too tall for screen
 (#8248)

---
 app/assets/stylesheets/common/base/menu-panel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index a02fccf8b8..a29da3f029 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -51,7 +51,7 @@
     touch-action: pan-y pinch-zoom;
     overflow-y: auto;
     overflow-x: hidden;
-    max-height: 100vh;
+    max-height: calc(100vh - 100px);
   }
 
   .badge-notification {

From 2cb805a6832e2d442f729fea80c76442375c6be6 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sat, 2 Nov 2019 17:14:04 +0530
Subject: [PATCH 289/328] DEV: Add option to keep onebox body content in post
 excerpt.

---
 lib/excerpt_parser.rb                  | 18 +++++++---
 spec/components/excerpt_parser_spec.rb | 47 ++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 9b17240d9f..479c46ef99 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -18,6 +18,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     @keep_newlines = options[:keep_newlines] == true
     @keep_emoji_images = options[:keep_emoji_images] == true
     @keep_onebox_source = options[:keep_onebox_source] == true
+    @keep_onebox_body = options[:keep_onebox_body] == true
     @remap_emoji = options[:remap_emoji] == true
     @start_excerpt = false
     @in_details_depth = 0
@@ -34,7 +35,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
       parser.parse(html)
     end
     excerpt = me.excerpt.strip
-    excerpt = excerpt.gsub(/\s*\n+\s*/, "\n\n") if options[:keep_onebox_source]
+    excerpt = excerpt.gsub(/\s*\n+\s*/, "\n\n") if options[:keep_onebox_source] || options[:keep_onebox_body]
     excerpt = CGI.unescapeHTML(excerpt) if options[:text_entities] == true
     excerpt
   end
@@ -95,13 +96,22 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
     when "aside"
       attributes = Hash[*attributes.flatten]
-      unless @keep_onebox_source && attributes['class'].include?('onebox')
+      unless (@keep_onebox_source || @keep_onebox_body) && attributes['class'].include?('onebox')
         @in_quote = true
       end
 
+      if @keep_onebox_body && attributes['class'].include?('quote') && attributes['data-topic'].present?
+        @in_quote = false
+      end
+
     when 'article'
-      if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
-        @in_quote = true
+      if attributes.include?(['class', 'onebox-body'])
+        @in_quote = !@keep_onebox_body
+      end
+
+    when 'header'
+      if attributes.include?(['class', 'source'])
+        @in_quote = !@keep_onebox_source
       end
 
     when "div", "span"
diff --git a/spec/components/excerpt_parser_spec.rb b/spec/components/excerpt_parser_spec.rb
index f3735a907f..ff11ec5578 100644
--- a/spec/components/excerpt_parser_spec.rb
+++ b/spec/components/excerpt_parser_spec.rb
@@ -34,4 +34,51 @@ describe ExcerptParser do
     expect(ExcerptParser.get_excerpt(html, 3, {})).to match_html('<details class="disabled"><summary>foo</summary></details>')
     expect(ExcerptParser.get_excerpt(html, 2, {})).to match_html('<details class="disabled"><summary>fo&hellip;</summary></details>')
   end
+
+  describe "keep_onebox_body parameter" do
+    it "keeps the body content for external oneboxes" do
+      html = <<~HTML.strip
+        <aside class="onebox">
+          <header class="source">
+            <img src="https://github.githubassets.com/favicon.ico" class="site-icon" width="32" height="32">
+            <a href="https://github.com/discourse/discourse" target="_blank">GitHub</a>
+          </header>
+          <article class="onebox-body">
+            <img src="/uploads/default/original/1X/10c0f1565ee5b6ca3fe43f3183529bc0afd26003.jpeg" class="thumbnail">
+            <h3>
+              <a href="https://github.com/discourse/discourse" target="_blank">discourse/discourse</a>
+            </h3>
+            <p>A platform for community discussion. Free, open, simple. - discourse/discourse</p>
+          </article>
+        </aside>
+      HTML
+      expect(ExcerptParser.get_excerpt(html, 100, keep_onebox_body: true)).to eq(<<~HTML.strip)
+        [image]
+
+        <a href="https://github.com/discourse/discourse" target="_blank">discourse/discourse</a>
+
+        A platform for community discussion. Free, o&hellip;
+      HTML
+    end
+
+    it "keeps the content for internal oneboxes" do
+      html = <<~HTML.strip
+        <aside class="quote" data-post="1" data-topic="8">
+          <div class="title">
+            <div class="quote-controls"></div>
+            <img width="20" height="20" src="/user_avatar/localhost/system/40/2_2.png" class="avatar">
+            <a href="/t/welcome-to-discourse/8/1">Welcome to Discourse</a>
+          </div>
+          <blockquote>The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage.</blockquote>
+        </aside>
+      HTML
+      expect(ExcerptParser.get_excerpt(html, 100, keep_onebox_body: true)).to eq(<<~HTML.strip)
+        [image]
+
+        <a href="/t/welcome-to-discourse/8/1">Welcome to Discourse</a>
+
+        The first paragraph of this pinned topic will be &hellip;
+      HTML
+    end
+  end
 end

From 8d69944b4ecb4b32672641dda8fd927dbe2354e8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 2 Nov 2019 13:54:41 +0100
Subject: [PATCH 290/328] FIX: update action should be in setting-component
 mixin (#8287)

This was causing an exception on some component (eg: value-list in a theme-component setting) which couldn't find an action named update.
---
 .../admin/components/site-setting.js.es6      | 59 -------------------
 .../admin/mixins/setting-component.js.es6     | 57 ++++++++++++++++++
 2 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 90c886c3a6..cd768407ff 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -2,8 +2,6 @@ import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SiteSetting from "admin/models/site-setting";
 import SettingComponent from "admin/mixins/setting-component";
-import showModal from "discourse/lib/show-modal";
-import AboutRoute from "discourse/routes/about";
 
 export default Component.extend(BufferedContent, SettingComponent, {
   updateExistingUsers: null,
@@ -13,62 +11,5 @@ export default Component.extend(BufferedContent, SettingComponent, {
     return SiteSetting.update(setting.get("setting"), setting.get("value"), {
       updateExistingUsers: this.updateExistingUsers
     });
-  },
-
-  actions: {
-    update() {
-      const defaultUserPreferences = [
-        "default_email_digest_frequency",
-        "default_include_tl0_in_digests",
-        "default_email_level",
-        "default_email_messages_level",
-        "default_email_mailing_list_mode",
-        "default_email_mailing_list_mode_frequency",
-        "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_notification_level_when_replying",
-        "default_other_external_links_in_new_tab",
-        "default_other_enable_quoting",
-        "default_other_enable_defer",
-        "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_first_post",
-        "default_tags_watching",
-        "default_tags_tracking",
-        "default_tags_muted",
-        "default_tags_watching_first_post",
-        "default_text_size",
-        "default_title_count_mode"
-      ];
-      const key = this.buffered.get("setting");
-
-      if (defaultUserPreferences.includes(key)) {
-        AboutRoute.create()
-          .model()
-          .then(result => {
-            const controller = showModal("site-setting-default-categories", {
-              model: {
-                count: result.stats.user_count,
-                key: key.replace(/_/g, " ")
-              },
-              admin: true
-            });
-
-            controller.set("onClose", () => {
-              this.updateExistingUsers = controller.updateExistingUsers;
-              this.send("save");
-            });
-          });
-      } else {
-        this.send("save");
-      }
-    }
   }
 });
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 3a7ab2e2c4..a8040a63ca 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -3,6 +3,8 @@ import computed from "ember-addons/ember-computed-decorators";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
+import showModal from "discourse/lib/show-modal";
+import AboutRoute from "discourse/routes/about";
 
 const CUSTOM_TYPES = [
   "bool",
@@ -114,6 +116,61 @@ export default Mixin.create({
   },
 
   actions: {
+    update() {
+      const defaultUserPreferences = [
+        "default_email_digest_frequency",
+        "default_include_tl0_in_digests",
+        "default_email_level",
+        "default_email_messages_level",
+        "default_email_mailing_list_mode",
+        "default_email_mailing_list_mode_frequency",
+        "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_notification_level_when_replying",
+        "default_other_external_links_in_new_tab",
+        "default_other_enable_quoting",
+        "default_other_enable_defer",
+        "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_first_post",
+        "default_tags_watching",
+        "default_tags_tracking",
+        "default_tags_muted",
+        "default_tags_watching_first_post",
+        "default_text_size",
+        "default_title_count_mode"
+      ];
+      const key = this.buffered.get("setting");
+
+      if (defaultUserPreferences.includes(key)) {
+        AboutRoute.create()
+          .model()
+          .then(result => {
+            const controller = showModal("site-setting-default-categories", {
+              model: {
+                count: result.stats.user_count,
+                key: key.replace(/_/g, " ")
+              },
+              admin: true
+            });
+
+            controller.set("onClose", () => {
+              this.updateExistingUsers = controller.updateExistingUsers;
+              this.send("save");
+            });
+          });
+      } else {
+        this.send("save");
+      }
+    },
+
     save() {
       this._save()
         .then(() => {

From 6f6a02645c334a10beb8fe0d3a0d5f7bdeaad299 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 3 Nov 2019 09:46:14 +0100
Subject: [PATCH 291/328] remove debug statement (#8289)

---
 lib/theme_javascript_compiler.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 64437e33ee..c11f1aa5e4 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -13,7 +13,6 @@ class ThemeJavascriptCompiler
 
       // Helper to replace old themeSetting syntax
       function generateHelper(settingParts) {
-console.log(settingParts)
         const settingName = settingParts.join('.');
         return {
             "path": {

From 24d4241e35e5b61eb74e63e8f7349ce4ee9fa29c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 3 Nov 2019 23:15:09 +0100
Subject: [PATCH 292/328] FIX: prevents whitelisted_generic_onebox_spec to fail
 with zeitwerk (#8288)

---
 spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb b/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb
index c3839d104d..dac0062f12 100644
--- a/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb
+++ b/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'oneboxer'
 
 describe Onebox::Engine::WhitelistedGenericOnebox do
 

From ce0bac7a3d76fffdee8630046ac84eb021770ca9 Mon Sep 17 00:00:00 2001
From: Joe <johani@discourse.org>
Date: Mon, 4 Nov 2019 07:15:14 +0800
Subject: [PATCH 293/328] FEATURE: fallback to image alt before filename if
 there's no title in lightboxes (#8286)

* use image alt as a fallback when there's no title

* update spec

we used to check that the overlay information is added when the image has a titie. This adds 2 more scenarios. One where an image has both a title and an alt, in which case the title should be used and alt ignored.

The other is when there's only an alt, it should then be used to generate the overlay
---
 lib/cooked_post_processor.rb                  |  2 +-
 spec/components/cooked_post_processor_spec.rb | 66 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index a6dfd64218..78591ee254 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -426,7 +426,7 @@ class CookedPostProcessor
     informations = +"#{original_width}×#{original_height}"
     informations << " #{upload.human_filesize}" if upload
 
-    a["title"] = CGI.escapeHTML(img["title"] || filename)
+    a["title"] = CGI.escapeHTML(img["title"] || img["alt"] || filename)
 
     meta.add_child create_icon_node("far-image")
     meta.add_child create_span_node("filename", a["title"])
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 174c8b0ef5..c1870ed6b1 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -597,7 +597,38 @@ describe CookedPostProcessor do
 
       end
 
-      context "with title" do
+      context "with title and alt" do
+        fab!(:post) do
+          Fabricate(:post, raw: <<~HTML)
+          <img src="#{upload.url}" title="WAT" alt="RED">
+          HTML
+        end
+
+        let(:cpp) { CookedPostProcessor.new(post, disable_loading_image: true) }
+
+        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
+          cpp.post_process
+
+          expect(cpp.html).to match_html <<~HTML
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/uploads/default/#{upload.sha1}" title="WAT"><img src="//test.localhost/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" title="WAT" alt="RED" width="690" height="788"><div class="meta">
+            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">WAT</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
+            </div></a></div></p>
+          HTML
+
+          expect(cpp).to be_dirty
+        end
+
+      end
+
+      context "with title only" do
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" title="WAT">
@@ -614,7 +645,7 @@ describe CookedPostProcessor do
           FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
-        it "generates overlay information" do
+        it "generates overlay information using image title" do
           cpp.post_process
 
           expect(cpp.html).to match_html <<~HTML
@@ -628,6 +659,37 @@ describe CookedPostProcessor do
 
       end
 
+      context "with alt only" do
+        fab!(:post) do
+          Fabricate(:post, raw: <<~HTML)
+          <img src="#{upload.url}" alt="RED">
+          HTML
+        end
+
+        let(:cpp) { CookedPostProcessor.new(post, disable_loading_image: true) }
+
+        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
+          cpp.post_process
+
+          expect(cpp.html).to match_html <<~HTML
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/uploads/default/#{upload.sha1}" title="RED"><img src="//test.localhost/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" alt="RED" width="690" height="788"><div class="meta">
+            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">RED</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
+            </div></a></div></p>
+          HTML
+
+          expect(cpp).to be_dirty
+        end
+
+      end
+
       context "topic image" do
         let(:post) { Fabricate(:post_with_uploaded_image) }
         let(:cpp) { CookedPostProcessor.new(post) }

From 7eb26e5bbb16c153faeda2665518ebb65d701f73 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sun, 3 Nov 2019 18:47:53 -0500
Subject: [PATCH 294/328] FIX: ensure menu not too tall on desktop only

Followup to af65809e, menu-panel shorter than 100vh does not look good on mobile.
---
 app/assets/stylesheets/common/base/menu-panel.scss | 2 +-
 app/assets/stylesheets/desktop/menu-panel.scss     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/stylesheets/desktop/menu-panel.scss

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index a29da3f029..a02fccf8b8 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -51,7 +51,7 @@
     touch-action: pan-y pinch-zoom;
     overflow-y: auto;
     overflow-x: hidden;
-    max-height: calc(100vh - 100px);
+    max-height: 100vh;
   }
 
   .badge-notification {
diff --git a/app/assets/stylesheets/desktop/menu-panel.scss b/app/assets/stylesheets/desktop/menu-panel.scss
new file mode 100644
index 0000000000..a6e7bbaf5b
--- /dev/null
+++ b/app/assets/stylesheets/desktop/menu-panel.scss
@@ -0,0 +1,3 @@
+.menu-panel .panel-body {
+  max-height: calc(100vh - 100px);
+}

From ff33899323f71ca750c0e555ce8f71d8896a3b3a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 4 Nov 2019 12:51:35 +1100
Subject: [PATCH 295/328] FEATURE: allow publishing docker dev either locally
 or net wide

Previously we had no control over how internal ports in the containter got
published.

Following UNICORN_BIND_ALL=true setting this broke docker dev env and exposed
this weakness.

The new `d/boot_dev` will only export on localhost, if you wish to export
network with use `d/boot_dev -p`
---
 bin/docker/boot_dev | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 679608866c..be8d17dc5c 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -13,11 +13,13 @@ Usage: ${0##*/} [-e VAR=VAL] [--env VAR=VAL] [--env-file filename] [-h] [--init]
   -e, --env       set environment variables
       --env-file  pass in a file containing a list of environment variable assignments
       --init      perform first-time initialization
+  -p --net-public publish ports on container on 0.0.0.0 (less secure as users on LAN may see dev env)
 EOF
 }
 
 initialize=""
 ENV_ARGS=""
+local_publish="127.0.0.1"
 
 while [ "${#@}" -ne "0" ]; do
     case "$1" in
@@ -28,6 +30,9 @@ while [ "${#@}" -ne "0" ]; do
         -i | --init)
             initialize="initialize"
             ;;
+        -p | --net-public)
+            local_publish="0.0.0.0"
+            ;;
         -e | --env)
             if [ -z "$2" ]; then
                 show_help
@@ -76,12 +81,13 @@ done
 
 docker pull discourse/discourse_dev:release
 docker run -d \
-    -p 1080:1080 \
-    -p 3000:3000 \
-    -p 9292:9292 \
-    -p 9405:9405 \
+    -p $local_publish:1080:1080 \
+    -p $local_publish:3000:3000 \
+    -p $local_publish:9292:9292 \
+    -p $local_publish:9405:9405 \
     -v "$DATA_DIR:/shared/postgres_data:delegated" \
     -v "$SOURCE_DIR:/src:delegated" \
+    -e UNICORN_BIND_ALL=true \
     $mount_plugin_symlinks \
     $ENV_ARGS \
     --hostname=discourse \

From cb9702bf7ae63c89c92f97476f96ebaa63e515cc Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 4 Nov 2019 10:46:20 +0530
Subject: [PATCH 296/328] Bump onebox version.

- Remove native caching
- FIX: dropbox videos were not loading
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9f52abc977..f728eef550 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.9.20'
+gem 'onebox', '1.9.21'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f6f45cd9e9..4176a30f6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,6 @@ GEM
     mocha (1.8.0)
       metaclass (~> 0.0.1)
     mock_redis (0.19.0)
-    moneta (1.2.0)
     msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -244,9 +243,8 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.20)
+    onebox (1.9.21)
       htmlentities (~> 4.3)
-      moneta (~> 1.0)
       multi_json (~> 1.11)
       mustache
       nokogiri (~> 1.7)
@@ -499,7 +497,7 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.9.20)
+  onebox (= 1.9.21)
   openid-redis-store
   parallel_tests
   pg

From 72bc0f82b9e0362588163f3e69ebdc1afc5ebf85 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 4 Nov 2019 10:59:28 +0530
Subject: [PATCH 297/328] FIX: no need to pass `cache` option in onebox

---
 lib/oneboxer.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index c77857ad57..54a1a3c934 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -275,7 +275,6 @@ module Oneboxer
       return blank_onebox if uri.blank? || blacklisted_domains.map { |hostname| uri.hostname.match?(hostname) }.any?
 
       options = {
-        cache: {},
         max_width: 695,
         sanitize_config: Onebox::DiscourseOneboxSanitizeConfig::Config::DISCOURSE_ONEBOX
       }

From f66e5d38d3aebb358bc83c6985c5285fe444b269 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 4 Nov 2019 19:07:11 +1100
Subject: [PATCH 298/328] FEATURE: add an "init" method for extra nav items

This allows us to trigger special initialization code prior to adding an
extra nav item to the navigation menu.
---
 .../discourse/lib/plugin-api.js.es6            | 18 +++++++++++++++---
 .../discourse/models/nav-item.js.es6           | 10 +++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 9658a959e2..88f2d7381d 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -46,7 +46,7 @@ import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.35";
+const PLUGIN_API_VERSION = "0.8.36";
 
 class PluginApi {
   constructor(version, container) {
@@ -716,7 +716,7 @@ class PluginApi {
 
   /**
    *
-   * Adds a new item in the navigation bar.
+   * Adds a new item in the navigation bar. Returns the NavItem object created.
    *
    * Example:
    *
@@ -729,12 +729,16 @@ class PluginApi {
    * An optional `customFilter` callback can be included to not display the
    * nav item on certain routes
    *
+   * An optional `init` callback can be included to run custom code on menu
+   * init
+   *
    * Example:
    *
    * addNavigationBarItem({
    *   name: "link-to-bugs-category",
    *   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"; },
    *   before: "top",
@@ -773,7 +777,15 @@ class PluginApi {
         };
       }
 
-      addNavItem(item);
+      const init = item.init;
+      if (init) {
+        const router = this.container.lookup("service:router");
+        item.init = function(navItem, category, args) {
+          init(navItem, category, args, router);
+        };
+      }
+
+      return addNavItem(item);
     }
   }
 
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index f03a5fc131..5b36d3b4e4 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -118,6 +118,8 @@ const ExtraNavItem = NavItem.extend({
     }
   }),
 
+  count: 0,
+
   customFilter: null
 });
 
@@ -196,6 +198,10 @@ NavItem.reopenClass({
     let forceActive = false;
 
     extraItems.forEach(item => {
+      if (item.init) {
+        item.init.call(this, item, category, args);
+      }
+
       const before = item.before;
       if (before) {
         let i = 0;
@@ -243,5 +249,7 @@ export function customNavItemHref(cb) {
 }
 
 export function addNavItem(item) {
-  NavItem.extraNavItems.push(ExtraNavItem.create(item));
+  const navItem = ExtraNavItem.create(item);
+  NavItem.extraNavItems.push(navItem);
+  return navItem;
 }

From b7327d2c3475c5741b97274970f771851719d62d Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 4 Nov 2019 14:47:00 +0530
Subject: [PATCH 299/328] UX: show user email address on "grant admin access"
 email and UI

---
 app/jobs/regular/admin_confirmation_email.rb | 4 +++-
 app/mailers/admin_confirmation_mailer.rb     | 3 ++-
 app/views/users/confirm_admin.html.erb       | 2 +-
 config/locales/server.en.yml                 | 4 ++--
 lib/admin_confirmation.rb                    | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/jobs/regular/admin_confirmation_email.rb b/app/jobs/regular/admin_confirmation_email.rb
index 23fd5b3d06..48746de408 100644
--- a/app/jobs/regular/admin_confirmation_email.rb
+++ b/app/jobs/regular/admin_confirmation_email.rb
@@ -7,13 +7,15 @@ module Jobs
     def execute(args)
       to_address = args[:to_address]
       token = args[:token]
+      target_email = args[:target_email]
       target_username = args[:target_username]
 
       raise Discourse::InvalidParameters.new(:to_address) if to_address.blank?
       raise Discourse::InvalidParameters.new(:token) if token.blank?
+      raise Discourse::InvalidParameters.new(:target_email) if target_email.blank?
       raise Discourse::InvalidParameters.new(:target_username) if target_username.blank?
 
-      message = AdminConfirmationMailer.send_email(to_address, target_username, token)
+      message = AdminConfirmationMailer.send_email(to_address, target_email, target_username, token)
       Email::Sender.new(message, :admin_confirmation_message).send
     end
 
diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb
index e7ff1cde99..9b6ffa2409 100644
--- a/app/mailers/admin_confirmation_mailer.rb
+++ b/app/mailers/admin_confirmation_mailer.rb
@@ -3,10 +3,11 @@
 class AdminConfirmationMailer < ActionMailer::Base
   include Email::BuildEmailHelper
 
-  def send_email(to_address, target_username, token)
+  def send_email(to_address, target_email, target_username, token)
     build_email(
       to_address,
       template: 'admin_confirmation_mailer',
+      target_email: target_email,
       target_username: target_username,
       admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url)
     )
diff --git a/app/views/users/confirm_admin.html.erb b/app/views/users/confirm_admin.html.erb
index 2f9d3cdd4a..e9a1dbbea1 100644
--- a/app/views/users/confirm_admin.html.erb
+++ b/app/views/users/confirm_admin.html.erb
@@ -3,7 +3,7 @@
   <br/>
 
   <%- unless @confirmed %>
-    <%=raw (t('activation.admin_confirm.description', target_username: @confirmation.target_user.username)) %>
+    <%=raw (t('activation.admin_confirm.description', target_email: @confirmation.target_user.email, target_username: @confirmation.target_user.username)) %>
     <br/>
     <br/>
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index bc323fbb77..bdebcbbdd5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -822,7 +822,7 @@ en:
     activated: "Sorry, this account has already been activated."
     admin_confirm:
       title: "Confirm Admin Account"
-      description: "Are you sure you want <b>%{target_username}</b> to be an administrator?"
+      description: "Are you sure you want <b>%{target_username} (%{target_email})</b> to be an administrator?"
       grant: "Grant Admin Access"
       complete: "<b>%{target_username}</b> is now an administrator."
       back_to: "Return to %{title}"
@@ -2477,7 +2477,7 @@ en:
     title: "Admin Confirmation"
     subject_template: "[%{email_prefix}] Confirm new Admin Account"
     text_body_template: |
-      Please confirm that you'd like to add **%{target_username}** as an administrator for your forum.
+      Please confirm that you'd like to add **%{target_username} (%{target_email})** as an administrator for your forum.
 
       [Confirm Administrator Account](%{admin_confirm_url})
 
diff --git a/lib/admin_confirmation.rb b/lib/admin_confirmation.rb
index d21b8aaac9..bf9254db43 100644
--- a/lib/admin_confirmation.rb
+++ b/lib/admin_confirmation.rb
@@ -26,6 +26,7 @@ class AdminConfirmation
     Jobs.enqueue(
       :admin_confirmation_email,
       to_address: @performed_by.email,
+      target_email: @target_user.email,
       target_username: @target_user.username,
       token: @token
     )

From d43e7354ec43232196ebdfb13f8c5c9e2bddaf43 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 4 Nov 2019 11:23:54 +0100
Subject: [PATCH 300/328] DEV: Convert <button> tags to {{d-button}} components
 (#8224)

* DEV: Convert <button> tags to {{d-button}}

* Fixes
---
 .../admin/templates/badges-show.hbs           | 11 +++++-
 .../admin/templates/customize-colors-show.hbs | 36 +++++++++++++++---
 .../admin/templates/customize-themes-show.hbs |  5 ++-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-index.hbs           |  6 ++-
 .../admin/templates/email-preview-digest.hbs  | 13 +++++--
 .../javascripts/admin/templates/emojis.hbs    |  7 +++-
 .../admin/templates/logs/screened-emails.hbs  |  8 +++-
 .../admin/templates/logs/screened-urls.hbs    |  7 +++-
 .../modal/admin-color-scheme-select-base.hbs  |  6 ++-
 .../templates/modal/admin-start-backup.hbs    | 13 +++++--
 .../templates/modal/admin-theme-change.hbs    |  5 ++-
 .../admin/templates/user-badges.hbs           | 14 +++++--
 .../admin/templates/users-list-show.hbs       | 18 ++++++---
 .../discourse/components/badge-title.js.es6   |  5 ---
 .../discourse/controllers/change-owner.js.es6 |  5 ---
 .../controllers/full-page-search.js.es6       |  6 ---
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/badge-title.hbs      |  6 ++-
 .../components/create-topic-button.hbs        |  2 +-
 .../components/edit-category-security.hbs     |  5 ++-
 .../templates/components/ip-lookup.hbs        | 18 +++++----
 .../components/modal-footer-close.hbs         |  5 ++-
 .../templates/components/tag-groups-form.hbs  | 14 ++++++-
 .../templates/components/user-stream-item.hbs |  8 ++--
 .../discourse/templates/discovery/topics.hbs  | 29 ++++++++++++---
 .../discourse/templates/full-page-search.hbs  |  8 ++--
 .../discourse/templates/invites/show.hbs      |  6 ++-
 .../templates/mobile/discovery/topics.hbs     | 16 ++++++--
 .../discourse/templates/modal/auth-token.hbs  |  6 ++-
 .../modal/bulk-notification-level.hbs         |  5 ++-
 .../templates/modal/change-owner.hbs          |  6 ++-
 .../templates/modal/create-account.hbs        |  8 +++-
 .../templates/modal/dismiss-read.hbs          |  7 +++-
 .../discourse/templates/modal/grant-badge.hbs |  8 ++--
 .../discourse/templates/modal/login.hbs       |  8 ++--
 .../modal/second-factor-add-security-key.hbs  |  5 ++-
 .../modal/second-factor-add-totp.hbs          |  5 ++-
 .../modal/second-factor-backup-edit.hbs       |  4 +-
 .../discourse/templates/preferences-email.hbs |  6 ++-
 .../templates/preferences-second-factor.hbs   |  9 +++--
 .../templates/preferences-username.hbs        | 11 +++++-
 .../discourse/templates/tag-groups.hbs        |  6 ++-
 .../discourse/templates/user/messages.hbs     | 37 ++++++++++++-------
 .../user/preferences/_save-button.hbs         |  6 ++-
 .../components/combo-box/combo-box-header.hbs |  7 ++--
 .../future-date-input-selector-header.hbs     |  7 ++--
 .../stylesheets/common/admin/customize.scss   |  1 -
 .../discourse-local-dates-create-form.hbs     |  3 +-
 49 files changed, 317 insertions(+), 126 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index eaaa9fcde1..7a50b1084b 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -39,7 +39,10 @@
           content=badgeGroupings
           class="badge-selector"
           nameProperty="name"}}
-        <button {{action "editGroupings"}} class='btn btn-icon no-text btn-default'>{{d-icon "pencil-alt"}}</button>
+        {{d-button
+          class="btn-default"
+          action=(route-action "editGroupings")
+          icon="pencil-alt"}}
       </div>
     </div>
 
@@ -138,7 +141,11 @@
     </div>
 
     <div class='buttons'>
-      <button {{action "save"}} disabled={{saving}} class='btn btn-primary'>{{i18n 'admin.badges.save'}}</button>
+      {{d-button
+        class="btn-primary"
+        action=(action "save")
+        disabled=saving
+        label="admin.badges.save"}}
       <span class='saving'>{{savingStatus}}</span>
       {{#unless readOnly}}
         <a {{action "destroy"}} class='delete-link'>{{i18n 'admin.badges.delete'}}</a>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index da53bb9808..a903e0d996 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -3,15 +3,31 @@
     <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}}
-      <button {{action "save"}} disabled={{model.disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
+      {{d-button
+        class="btn-primary"
+        action=(action "save")
+        disabled=model.disableSave
+        label="admin.customize.save"}}
       {{/unless}}
-      <button {{action "copy" model}} class='btn btn-default'>{{d-icon "copy"}} {{i18n 'admin.customize.copy'}}</button>
-      <button {{action "copyToClipboard" model}} class='btn btn-default'>{{d-icon "far-clipboard"}} {{i18n 'admin.customize.copy_to_clipboard'}}</button>
+      {{d-button
+        class="btn-default"
+        action=(action "copy" model)
+        icon="copy"
+        label="admin.customize.copy"}}
+      {{d-button
+        class="btn-default"
+        action=(action "copyToClipboard" model)
+        icon="far-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}}
       {{else}}
-      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'admin.customize.delete'}}</button>
+      {{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>
@@ -46,8 +62,16 @@
             <td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td>
             <td class="actions">
             {{#unless model.theme_id}}
-              <button class="btn btn-default revert {{unless c.savedIsOverriden 'invisible'}}" {{action "revert" c}} title="{{i18n 'admin.customize.colors.revert_title'}}">{{i18n 'revert'}}</button>
-              <button class="btn btn-default undo {{unless c.changed 'invisible'}}" {{action "undo" c}} title="{{i18n 'admin.customize.colors.undo_title'}}">{{i18n 'undo'}}</button>
+              {{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>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index f7e198d39d..4b28949ad2 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -171,7 +171,10 @@
       </div>
     {{/if}}
 
-    {{#d-button action=(action "editTheme") class="btn btn-default edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}}
+    {{d-button
+      class="btn-default edit"
+      action=(action "editTheme")
+      label="admin.customize.theme.edit_css_html"}}
   </div>
 
   <div class="control-unit">
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index c0b8ee7a27..34853b20e8 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -3,7 +3,9 @@
 <div class='email-advanced-test'>
   <label for="email">{{i18n 'admin.email.advanced_test.email'}}</label>
   {{textarea name="email" value=email class="email-body"}}
-  <button class='btn' {{action "run"}}>{{i18n 'admin.email.advanced_test.run'}}</button>
+  {{d-button
+    action=(action "run")
+    label="admin.email.advanced_test.run"}}
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index c21e3a5ca6..42109ddaa9 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -20,7 +20,11 @@
     {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
   <div class='controls'>
-    <button class='btn btn-primary' {{action "sendTestEmail"}} disabled={{sendTestEmailDisabled}}>{{i18n 'admin.email.send_test'}}</button>
+    {{d-button
+      class="btn-primary"
+      action=(action "sendTestEmail")
+      disabled=sendTestEmailDisabled
+      label="admin.email.send_test"}}
     {{#if sentTestEmailMessage}}<span class='result-message'>{{sentTestEmailMessage}}</span>{{/if}}
   </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 32df5b0d97..932aa9ffc2 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -6,7 +6,10 @@
     {{date-picker-past value=lastSeen id="last-seen"}}
     <label>{{i18n 'admin.email.user'}}:</label>
     {{user-selector single="true" usernames=username canReceiveUpdates="true"}}
-    <button class='btn btn-primary digest-refresh-button' {{action "refresh"}}>{{i18n 'admin.email.refresh'}}</button>
+    {{d-button
+      class="btn-primary digest-refresh-button"
+      action=(action "refresh")
+      label="admin.email.refresh"}}
     <div class="toggle">
       <label>{{i18n 'admin.email.format'}}</label>
       {{#if showHtml}}
@@ -30,7 +33,11 @@
         {{else}}
           <label>{{i18n 'admin.email.send_digest_label'}}</label>
           {{text-field value=email placeholderKey="admin.email.test_email_address"}}
-          <button class='btn btn-default' {{action "sendEmail"}} disabled={{sendEmailDisabled}}>{{i18n 'admin.email.send_digest'}}</button>
+          {{d-button
+            class="btn-default"
+            action=(action "sendEmail")
+            disabled=sendEmailDisabled
+            label="admin.email.send_digest"}}
           {{#if sentEmail}}
             <span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>
           {{/if}}
@@ -51,4 +58,4 @@
     </div>
   </div>
 
-{{/conditional-loading-spinner}}
\ No newline at end of file
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index f677287654..6281b15c05 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -20,7 +20,12 @@
             <tr>
               <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
               <th>:{{e.name}}:</th>
-              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon "far-trash-alt"}} </button></th>
+              <th>
+                {{d-button
+                  action=(action "destroy" e)
+                  class="btn-danger pull-right"
+                  icon="far-trash-alt"}}
+              </th>
             </tr>
           {{/each}}
         </tbody>
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index 532e68c29c..e8cb30140c 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -1,7 +1,13 @@
 <p>
   {{i18n 'admin.logs.screened_emails.description'}}
 </p>
-  <button class="btn btn-default screened-email-export" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+
+{{d-button
+  class="btn-default screened-email-export"
+  action=(action "exportScreenedEmailList")
+  title="admin.export_csv.button_title.screened_email"
+  icon="download"
+  label="admin.export_csv.button_text"}}
 
 <br>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index c2a526e5f7..1ee4274368 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -1,7 +1,12 @@
 <p>
   {{i18n 'admin.logs.screened_urls.description'}}
 </p>
-  <button class="btn btn-default" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+  {{d-button
+    class="btn-default"
+    action=(action "exportScreenedUrlList")
+    title="admin.export_csv.button_title.screened_url"
+    icon="download"
+    label="admin.export_csv.button_text"}}
 <br>
 
 {{#conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
index 371c06df49..e1978b918a 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
@@ -7,6 +7,10 @@
                    valueAttribute="base_scheme_id"}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action "selectBase"}}>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
+    {{d-button
+      class="btn-primary"
+      action=(action "selectBase")
+      icon="plus"
+      label="admin.customize.new"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
index 0990760888..dd201e2aed 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
@@ -1,5 +1,12 @@
 {{#d-modal-body title="admin.backups.operations.backup.confirm"}}
-  <button {{action "startBackupWithUploads"}} class="btn btn-primary">{{i18n 'yes_value'}}</button>
-  <button {{action "startBackupWithoutUploads"}} class="btn">{{i18n 'admin.backups.operations.backup.without_uploads'}}</button>
-  <button {{action "cancel"}} class="btn">{{i18n 'no_value'}}</button>
+  {{d-button
+    class="btn-primary"
+    action=(action "startBackupWithUploads")
+    label="yes_value"}}
+  {{d-button
+    action=(action "startBackupWithoutUploads")
+    label="admin.backups.operations.backup.without_uploads"}}
+  {{d-button
+    action=(action "cancel")
+    label="no_value"}}
 {{/d-modal-body}}
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 1b6b06870a..ec26f608d8 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -3,6 +3,9 @@
     {{{diff}}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    {{d-button class="btn btn-primary" action=(route-action "closeModal") label="close"}}
+    {{d-button
+      class="btn-primary"
+      action=(route-action "closeModal")
+      label="close"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 92e4403fe1..9f81cd2f74 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -22,7 +22,10 @@
       <label>{{i18n 'admin.badges.reason'}}</label>
       {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
       </div>
-      <button class='btn btn-primary' {{action "grantBadge"}}>{{i18n 'admin.badges.grant'}}</button>
+      {{d-button
+        class="btn-primary"
+        action=(action "grantBadge")
+        label="admin.badges.grant"}}
     </form>
     {{/if}}
 
@@ -52,9 +55,14 @@
           <td>{{age-with-tooltip userBadge.granted_at}}</td>
           <td>
             {{#if userBadge.grouped}}
-              <button class='btn' {{action "expandGroup" userBadge}}>{{{i18n 'admin.badges.expand'}}}</button>
+              {{d-button
+                action=(action "expandGroup" userBadge)
+                label="admin.badges.expand"}}
             {{else}}
-              <button class='btn btn-danger' {{action "revokeBadge" userBadge}}>{{i18n 'admin.badges.revoke'}}</button>
+              {{d-button
+                class="btn-danger"
+                action=(action "revokeBadge" userBadge)
+                label="admin.badges.revoke"}}
             {{/if}}
           </td>
         </tr>
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 36cc552089..065d2ed93d 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -1,16 +1,22 @@
 <div class="admin-title">
   <h2>{{title}}</h2>
   {{#if canCheckEmails}}
-      {{#if showEmails}}
-        <button {{action "toggleEmailVisibility"}} class="hide-emails btn btn-default">{{i18n 'admin.users.hide_emails'}}</button>
-      {{else}}
-        <button {{action "toggleEmailVisibility"}} class="show-emails btn btn-default">{{i18n 'admin.users.show_emails'}}</button>
-      {{/if}}
+    {{#if showEmails}}
+      {{d-button
+        action=(action "toggleEmailVisibility")
+        class="hide-emails btn-default"
+        label="admin.users.hide_emails"}}
+    {{else}}
+      {{d-button
+        action=(action "toggleEmailVisibility")
+        class="show-emails btn-default"
+        label="admin.users.show_emails"}}
+    {{/if}}
   {{/if}}
 </div>
+
 <div class='username controls'>
   {{text-field value=listFilter placeholder=searchHint}}
-
 </div>
 
 {{#load-more selector=".users-list tr" action=(action "loadMore")}}
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js.es6
index 41b82f73e7..d7fd08c318 100644
--- a/app/assets/javascripts/discourse/components/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-title.js.es6
@@ -8,11 +8,6 @@ export default Component.extend({
   saved: false,
   saving: false,
 
-  @computed("saving")
-  savingStatus(saving) {
-    return saving ? I18n.t("saving") : I18n.t("save");
-  },
-
   @computed("selectableUserBadges", "selectedUserBadgeId")
   selectedUserBadge(selectableUserBadges, selectedUserBadgeId) {
     return selectableUserBadges.findBy("id", parseInt(selectedUserBadgeId));
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 4047a2eb35..10ed05c04f 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -21,11 +21,6 @@ export default Controller.extend(ModalFunctionality, {
     return saving || isEmpty(newUser);
   },
 
-  @computed("saving")
-  buttonTitle(saving) {
-    return saving ? I18n.t("saving") : I18n.t("topic.change_owner.action");
-  },
-
   onShow() {
     this.setProperties({
       saving: false,
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 e54ce43ab7..0b37bead27 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -16,7 +16,6 @@ import {
 import Category from "discourse/models/category";
 import { escapeExpression } from "discourse/lib/utilities";
 import { setTransient } from "discourse/lib/page-tracker";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import Composer from "discourse/models/composer";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
@@ -199,11 +198,6 @@ export default Controller.extend({
     return this.currentUser && userCanCreateTopic;
   },
 
-  @computed("expanded")
-  searchAdvancedIcon(expanded) {
-    return iconHTML(expanded ? "caret-down" : "caret-right");
-  },
-
   @computed("page")
   isLastPage(page) {
     return page === PAGE_LIMIT;
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 933bc48de8..9eeb3d7fa2 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -13,7 +13,7 @@
           <div class='grant-info-item'>
             {{i18n 'badges.allow_title'}}
             {{d-button
-              class="btn btn-default pad-left no-text"
+              class="btn-default pad-left"
               action=(action "toggleSetUserTitle")
               icon="pencil-alt"}}
           </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index 14c3ee8b6c..5361595199 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -18,7 +18,11 @@
 
     <div class="control-group">
       <div class="controls">
-        <button class="btn btn-primary" disabled={{saving}} {{action "save"}}> {{savingStatus}} </button>
+        {{d-button
+          class="btn-primary"
+          action=(action "save")
+          disabled=saving
+          label=(if saving "saving" "save")}}
         {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
index e99673f9cb..3a0e3ebfa9 100644
--- a/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
@@ -1,7 +1,7 @@
 {{#if canCreateTopic}}
   {{d-button
+    class="btn-default"
     id="create-topic"
-    class="btn btn-default"
     action=action
     icon="plus"
     disabled=disabled
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 94b2440b8e..9b238a1a1c 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -47,7 +47,10 @@
     {{/if}}
   {{else}}
     {{#unless category.is_special}}
-      <button {{action "editPermissions"}} class="btn btn-default btn-default edit-permission">{{i18n 'category.edit_permissions'}}</button>
+      {{d-button
+        action=(action "editPermissions")
+        class="btn-default edit-permission"
+        label="category.edit_permissions"}}
     {{/unless}}
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 291f5b54ee..adbc0cfd56 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -1,8 +1,9 @@
 {{#if ip}}
-  <button class="btn btn-default" {{action "lookup"}}>
-    {{d-icon "globe"}}
-    {{i18n "admin.user.ip_lookup"}}
-  </button>
+  {{d-button
+    class="btn-default"
+    action=(action "lookup")
+    icon="globe"
+    label="admin.user.ip_lookup"}}
 {{/if}}
 {{#if show}}
   <div class="location-box">
@@ -44,10 +45,13 @@
         {{i18n "ip_lookup.other_accounts"}}
         <strong>{{totalOthersWithSameIP}}</strong>
         {{#if other_accounts.length}}
-          <button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}>
-            {{d-icon "warning"}}
+          {{#d-button
+            class="btn-danger pull-right"
+            action=(action "deleteOtherAccounts")
+            icon="warning"
+          }}
             {{i18n "ip_lookup.delete_other_accounts" count=otherAccountsToDelete}}
-          </button>
+          {{/d-button}}
         {{/if}}
       </dt>
 
diff --git a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
index 8b21792616..0aa87bde2d 100644
--- a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
+++ b/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
@@ -1,3 +1,6 @@
 <div class="modal-footer">
-  {{d-button class="btn btn-primary" action=(route-action "closeModal") label="close"}}
+  {{d-button
+    class="btn-primary"
+    action=(route-action "closeModal")
+    label="close"}}
 </div>
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 b6b724f05e..7436a829f6 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
@@ -72,6 +72,16 @@
     </div>
   </section>
 
-  <button {{action "save"}} disabled={{savingDisabled}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button>
-  <button {{action "destroy"}} disabled={{buffered.isNew}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'tagging.groups.delete'}}</button>
+  {{d-button
+    class="btn-default"
+    action=(action "save")
+    disabled=savingDisabled
+    label="tagging.groups.save"}}
+
+  {{d-button
+    class="btn-danger"
+    action=(action "destroy")
+    disabled=buffered.isNew
+    icon="far-trash-alt"
+    label="tagging.groups.delete"}}
 </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 b8c69759be..823c447903 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -48,9 +48,11 @@
     {{d-icon child.icon class="icon"}}
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
-        <button class="btn btn-default remove-bookmark" {{action removeBookmark grandChild}}>
-          {{d-icon 'times'}} {{i18n "bookmarks.remove"}}
-        </button>
+        {{d-button
+          class="btn-default remove-bookmark"
+          action=(action removeBookmark grandChild)
+          icon="times"
+          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}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index a449e010a9..7cf20a817c 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -5,10 +5,20 @@
 {{#if showDismissAtTop}}
   <div class="row">
     {{#if showDismissRead}}
-      <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics-top' class='btn btn-default dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-topics-top"
+        action=(action "dismissReadPosts")
+        title="topics.bulk.dismiss_tooltip"
+        label="topics.bulk.dismiss_button"}}
     {{/if}}
     {{#if showResetNew}}
-    <button id='dismiss-new-top' class='btn btn-default dismiss-read' {{action "resetNew"}}>{{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-new-top"
+        action=(action "resetNew")
+        icon="check"
+        label="topics.bulk.dismiss_new"}}
     {{/if}}
   </div>
 {{/if}}
@@ -70,11 +80,20 @@
   {{conditional-loading-spinner condition=model.loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
-      <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn btn-default dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-topics"
+        action=(action "dismissReadPosts")
+        title="topics.bulk.dismiss_tooltip"
+        label="topics.bulk.dismiss_button"}}
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn btn-default dismiss-read' {{action "resetNew"}}>
-        {{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
+      {{d-button
+        class="btn-default dismiss-read"
+        action=(action "resetNew")
+        id="dismiss-new"
+        icon="check"
+        label="topics.bulk.dismiss_new"}}
     {{/if}}
 
     {{#footer-message education=footerEducation message=footerMessage}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 3a72a706e7..c2c15bb389 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -179,9 +179,11 @@
     {{/if}}
 
     {{#if site.mobileView}}
-      <button class="search-advanced-title btn" {{action "toggleAdvancedSearch"}}>
-        {{{searchAdvancedIcon}}} {{i18n "search.advanced.title"}}
-      </button>
+      {{d-button
+        class="search-advanced-title"
+        action=(action "toggleAdvancedSearch")
+        icon=(if expanded "caret-down" "caret-right")
+        label="search.advanced.title"}}
     {{else}}
       <span class="search-advanced-title">
         {{i18n "search.advanced.title"}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 6b3b461a0c..792e75640c 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -56,7 +56,11 @@
             </div>
           {{/if}}
 
-          <button class='btn btn-primary' {{action "submit"}} disabled={{submitDisabled}}>{{i18n 'invites.accept_invite'}}</button>
+          {{d-button
+            class="btn-primary"
+            action=(action "submit")
+            disabled=submitDisabled
+            label="invites.accept_invite"}}
 
           {{#if errorMessage}}
             <br/><br/>
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 6945a02df9..6c62f879de 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -30,12 +30,20 @@
   {{conditional-loading-spinner condition=model.loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
-      <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn btn-default dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-topics"
+        action=(action "dismissReadPosts")
+        title="topics.bulk.dismiss_tooltip"
+        label="topics.bulk.dismiss_button"}}
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn btn-default dismiss-read' {{action "resetNew"}}>
-        {{d-icon "check"}}
-        {{i18n 'topics.bulk.dismiss_new'}}</button>
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-new"
+        action=(action "resetNew")
+        icon="check"
+        label="topics.bulk.dismiss_new"}}
     {{/if}}
 
     {{#footer-message education=footerEducation message=footerMessage}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 7b239543c4..665a4e7e26 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -30,6 +30,10 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button class="btn btn-primary" icon="lock" label="user.auth_tokens.secure_account" action=(action "highlightSecure")}}
+  {{d-button
+    class="btn-primary"
+    action=(action "highlightSecure")
+    icon="lock"
+    label="user.auth_tokens.secure_account"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
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 34484ac613..8a780d2279 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -7,4 +7,7 @@
   </div>
 {{/each}}
 
-<button class='btn' disabled={{disabled}} {{action "changeNotificationLevel"}}>{{i18n 'topics.bulk.notification_level'}}</button>
+{{d-button
+  disabled=disabled
+  action=(action "changeNotificationLevel")
+  label="topics.bulk.notification_level"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index ecec3312b5..d7c33abbf0 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -11,5 +11,9 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-primary' disabled={{buttonDisabled}} {{action "changeOwnershipOfPosts"}}>{{buttonTitle}}</button>
+  {{d-button
+    class="btn-primary"
+    action=(action "changeOwnershipOfPosts")
+    disabled=buttonDisabled
+    label=(if saving "saving" "topic.change_owner.action")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index b5e76e633f..2894ed5f9a 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -113,10 +113,14 @@
 
     {{#if showCreateForm}}
       <div class="modal-footer">
-        <button class='btn btn-large btn-primary' disabled={{submitDisabled}} {{action "createAccount"}}>{{i18n 'create_account.title'}}</button>
+        {{d-button
+          class="btn-large btn-primary"
+          action=(action "createAccount")
+          disabled=submitDisabled
+          label="create_account.title"}}
 
         {{#conditional-loading-spinner condition=formSubmitted size="small"}}
-          {{#d-button class="btn btn-large" id="login-link" action=(route-action "showLogin")}}
+          {{#d-button class="btn-large" id="login-link" action=(route-action "showLogin")}}
             {{i18n "log_in"}}
           {{/d-button}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
index 367359d9e7..79d398d71d 100644
--- a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
@@ -5,6 +5,9 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "dismissReadTopics" dismissTopics}}>
-    {{d-icon "check"}} {{i18n 'topics.bulk.dismiss'}}</button>
+  {{d-button
+    class="btn-primary"
+    action=(route-action "dismissReadTopics" dismissTopics)
+    icon="check"
+    label="topics.bulk.dismiss"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
index eadced1c9c..1f27bc5c34 100644
--- a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
@@ -9,7 +9,9 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-primary' disabled={{buttonDisabled}} {{action "grantBadge"}}>
-    {{i18n 'admin.badges.grant'}}
-  </button>
+  {{d-button
+    class="btn-primary"
+    disabled=buttonDisabled
+    action=(action "grantBadge")
+    label="admin.badges.grant"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index beaa5569ca..84f79f8eb7 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -67,9 +67,11 @@
       {{/unless}}
 
       {{#if showSignupLink}}
-        <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
-          {{i18n 'create_account.title'}}
-        </button>
+        {{d-button
+          class="btn-large"
+          id="new-account-link"
+          action=(action "createAccount")
+          label="create_account.title"}}
       {{/if}}
     {{/if}}
 
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 a035eea0ea..d63b5fe8eb 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
@@ -23,8 +23,9 @@
     <div class="control-group">
       <div class="controls">
         {{#unless webauthnUnsupported}}
-          {{d-button action=(action "registerSecurityKey")
-            class="btn btn-primary add-totp"
+          {{d-button
+            class="btn-primary add-totp"
+            action=(action "registerSecurityKey")
             label="user.second_factor.security_key.register"}}
         {{/unless}}
       </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 80a13f8f30..32e3de5175 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
@@ -46,8 +46,9 @@
 
     <div class="control-group">
       <div class="controls">
-        {{d-button action=(action "enableSecondFactor")
-          class="btn btn-primary add-totp"
+        {{d-button
+          class="btn-primary add-totp"
+          action=(action "enableSecondFactor")
           label="enable"}}
       </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 491f13e8f9..83aa04e1b0 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
@@ -19,14 +19,14 @@
 
     <div class="actions">
       {{d-button
+        class="btn-primary"
         action=(action "generateSecondFactorCodes")
-        class="btn btn-primary"
         disabled=loading
         label=generateBackupCodeBtnLabel}}
       {{#if backupEnabled}}
         {{d-button
+          class="btn-danger"
           action=(action "disableSecondFactorBackup")
-          class="btn btn-danger"
           disabled=loading
           label="user.second_factor_backup.disable"}}
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 96b9f42fc2..6b5fac0539 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -49,7 +49,11 @@
 
       <div class="control-group">
         <div class="controls">
-          {{#d-button class="btn btn-primary" action=(action "changeEmail") disabled=saveDisabled}}
+          {{#d-button
+            class="btn-primary"
+            action=(action "changeEmail")
+            disabled=saveDisabled
+          }}
             {{saveButtonText}}
           {{/d-button}}
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index e043dcbaf5..675e005c39 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -109,8 +109,9 @@
           <div class="control-group">
             <div class="controls">
               <h2>{{i18n "user.second_factor.disable_title"}}</h2>
-              {{d-button action=(action "disableAllSecondFactors")
-                class="btn btn-danger"
+              {{d-button
+                class="btn-danger"
+                action=(action "disableAllSecondFactors")
                 disabled=loading
                 label="disable"}}
             </div>
@@ -137,8 +138,10 @@
 
       <div class="control-group">
         <div class="controls">
-          {{d-button action=(action "confirmPassword")
+          {{d-button
             class="btn-primary"
+            type="submit"
+            action=(action "confirmPassword")
             disabled=loading
             label="continue"}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index 28b2bee7e8..d2c94136c6 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -24,8 +24,15 @@
 
     <div class="control-group">
       <div class="controls">
-        <button {{action "changeUsername"}} disabled={{saveDisabled}} class="btn btn-primary">{{saveButtonText}}</button>
-          {{#if saved}}{{i18n 'saved'}}{{/if}}
+        {{#d-button
+          class="btn-primary"
+          action=(action "changeUsername")
+          disabled=saveDisabled
+        }}
+          {{saveButtonText}}
+        {{/d-button}}
+
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs
index bbb1d78c3e..f517650a27 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs
@@ -13,7 +13,11 @@
     </ul>
 
     {{#if this.siteSettings.tagging_enabled}}
-      <button {{action "newTagGroup"}} class='btn btn-default'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button>
+      {{d-button
+        class="btn-default"
+        action=(action "newTagGroup")
+        icon="plus"
+        label="tagging.groups.new"}}
     {{/if}}
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index bfc5eabf37..158e1fac29 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -58,37 +58,46 @@
 <section class='user-content'>
 
 <div class="list-actions">
-  
+
     {{#unless site.mobileView}}
       {{#if showToggleBulkSelect}}
-        <button {{action "toggleBulkSelect"}} class="btn btn-default bulk-select no-text" title="{{i18n "user.messages.bulk_select"}}">
-          {{d-icon "list"}}
-        </button>
+        {{d-button
+          class="btn-default bulk-select"
+          action=(action "toggleBulkSelect")
+          title="user.messages.bulk_select"
+          icon="list"}}
       {{/if}}
     {{/unless}}
 
     {{#if 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-private-message"
+          action=(route-action "composePrivateMessage")
+          icon="envelope"
+          label="user.new_private_message"}}
       {{/if}}
     {{/if}}
 
     {{#if canArchive}}
-    <button {{action "archive"}} class="btn btn-default btn-archive">
-      {{i18n "user.messages.move_to_archive"}}
-    </button>
+      {{d-button
+        class="btn-default btn-archive"
+        action=(action "archive")
+        label="user.messages.move_to_archive"}}
     {{/if}}
 
     {{#if canMoveToInbox}}
-    <button {{action "toInbox"}} class="btn btn-default btn-to-inbox">
-      {{i18n "user.messages.move_to_inbox"}}
-    </button>
+      {{d-button
+        class="btn-default btn-to-inbox"
+        action=(action "toInbox")
+        label="user.messages.move_to_inbox"}}
     {{/if}}
 
     {{#if bulkSelectEnabled}}
-    <button {{action "selectAll"}} class="btn btn-default btn-select-all">
-      {{i18n "user.messages.select_all"}}
-    </button>
+      {{d-button
+        class="btn-default btn-select-all"
+        action=(action "selectAll")
+        label="user.messages.select_all"}}
     {{/if}}
 
     {{#if isGroup}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
index 8a6c699742..c218e4e444 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
@@ -1,4 +1,8 @@
-{{#d-button action=(action "save") disabled=model.isSaving class="btn btn-primary save-user"}}
+{{#d-button
+  class="btn-primary save-user"
+  action=(action "save")
+  disabled=model.isSaving
+}}
   {{saveButtonText}}
 {{/d-button}}
 
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
index a090a66aaa..fbd9610f00 100644
--- a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
@@ -9,9 +9,10 @@
 </span>
 
 {{#if shouldDisplayClearableButton}}
-  <button class="btn-clear" {{action onClearSelection bubbles=false}}>
-    {{d-icon 'times'}}
-  </button>
+  {{d-button
+    class="btn-clear"
+    action=(action onClearSelection bubbles=false)
+    icon="times"}}
 {{/if}}
 
 {{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
index 8a630455bd..b0bd2ca02f 100644
--- a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
@@ -19,9 +19,10 @@
 {{/if}}
 
 {{#if shouldDisplayClearableButton}}
-  <button class="btn-clear" {{action onClearSelection bubbles=false}}>
-    {{d-icon 'times'}}
-  </button>
+  {{d-button
+    class="btn-clear"
+    action=(action onClearSelection bubbles=false)
+    icon="times"}}
 {{/if}}
 
 {{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 8ae3c50d58..7bc0de21ac 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -468,7 +468,6 @@
   }
   .color-scheme {
     .controls {
-      span,
       button,
       a {
         margin-right: 10px;
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 6344c9c11e..aae0484743 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
@@ -136,7 +136,8 @@
 
 <div class="modal-footer discourse-local-dates-create-modal-footer">
   {{#if isValid}}
-    {{d-button class="btn btn-primary"
+    {{d-button
+      class="btn-primary"
       action=(action "save")
       label="discourse_local_dates.create.form.insert"}}
   {{/if}}

From f3f04f16436bc414eed6c1f3c646d7e1a43ef953 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Sun, 3 Nov 2019 14:47:06 +0000
Subject: [PATCH 301/328] REFACTOR: Handle no_subcategories option during
 routing

---
 app/controllers/tags_controller.rb | 19 +++++++------------
 config/routes.rb                   |  2 ++
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index a8a766e653..9e2cfde202 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -296,21 +296,16 @@ class TagsController < ::ApplicationController
     slug_or_id = params[:category]
     return true if slug_or_id.nil?
 
-    if slug_or_id == 'none' && params[:parent_category]
-      @filter_on_category = Category.query_category(params[:parent_category], nil)
-      params[:no_subcategories] = 'true'
-    else
-      parent_slug_or_id = params[:parent_category]
+    parent_slug_or_id = params[:parent_category]
 
-      parent_category_id = nil
-      if parent_slug_or_id.present?
-        parent_category_id = Category.query_parent_category(parent_slug_or_id)
-        category_redirect_or_not_found && (return) if parent_category_id.blank?
-      end
-
-      @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
+    parent_category_id = nil
+    if parent_slug_or_id.present?
+      parent_category_id = Category.query_parent_category(parent_slug_or_id)
+      category_redirect_or_not_found && (return) if parent_category_id.blank?
     end
 
+    @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
+
     category_redirect_or_not_found && (return) if !@filter_on_category
 
     guardian.ensure_can_see!(@filter_on_category)
diff --git a/config/routes.rb b/config/routes.rb
index c00041b3e0..bc66be9ecf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -839,6 +839,7 @@ Discourse::Application.routes.draw do
       get '/:tag_id.rss' => 'tags#tag_feed'
       get '/:tag_id' => 'tags#show', as: 'tag_show'
       get '/c/:category/:tag_id' => 'tags#show', as: 'tag_category_show'
+      get '/c/:category/none/:tag_id' => 'tags#show', as: 'tag_category_none_show', defaults: { no_subcategories: true }
       get '/c/:parent_category/:category/:tag_id' => 'tags#show', as: 'tag_parent_category_category_show'
       get '/intersection/:tag_id/*additional_tag_ids' => 'tags#show', as: 'tag_intersection'
       get '/:tag_id/notifications' => 'tags#notifications'
@@ -849,6 +850,7 @@ Discourse::Application.routes.draw do
       Discourse.filters.each do |filter|
         get "/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_show_#{filter}"
         get "/c/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_show_#{filter}"
+        get "/c/:category/none/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_none_show_#{filter}", defaults: { no_subcategories: true }
         get "/c/:parent_category/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_parent_category_category_show_#{filter}"
       end
     end

From 74869b8a7f49aa634d1a2dac740eed45eca72c5a Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 4 Nov 2019 09:16:50 -0500
Subject: [PATCH 302/328] FIX: Do not consider mobile app traffic as crawler
 visits

Followup to a4eb523a
---
 lib/middleware/anonymous_cache.rb             |  2 +-
 .../middleware/request_tracker_spec.rb        | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 559605c69a..8c4ccc6afe 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -66,7 +66,7 @@ module Middleware
             if @env[DISCOURSE_RENDER] == "crawler" || CrawlerDetection.crawler?(user_agent, @env["HTTP_VIA"])
               :true
             else
-              user_agent.downcase.include?("discourse") ? :true : :false
+              user_agent.downcase.include?("discourse") && !user_agent.downcase.include?("mobile") ? :true : :false
             end
           end
         @is_crawler == :true
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index b7433f4af6..22fad3addc 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -68,17 +68,30 @@ describe Middleware::RequestTracker do
       expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
       expect(ApplicationRequest.page_view_anon_mobile.first.count).to eq(1)
 
-      # log discourse User Agent requests as crawler for page views
+      expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
+    end
+
+    it "can log Discourse user agent requests correctly" do
+      # log discourse api agents as crawlers for page view stats...
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "DiscourseAPI Ruby Gem 0.19.0"
       ), ["200", { "Content-Type" => 'text/html' }], 0.1)
 
       Middleware::RequestTracker.log_request(data)
       ApplicationRequest.write_cache!
+      expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
 
-      expect(ApplicationRequest.page_view_crawler.first.count).to eq(2)
+      # ...but count our mobile app user agents as regular visits
+      data = Middleware::RequestTracker.get_data(env(
+        "HTTP_USER_AGENT" => "Mozilla/5.0 AppleWebKit/605.1.15 Mobile/15E148 DiscourseHub)"
+      ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+
+      Middleware::RequestTracker.log_request(data)
+      ApplicationRequest.write_cache!
+
+      expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
+      expect(ApplicationRequest.page_view_anon.first.count).to eq(1)
     end
-
   end
 
   context "rate limiting" do

From fa56ba89a54a04b82aa260925019f722e609ca9e Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Mon, 4 Nov 2019 09:56:16 -0600
Subject: [PATCH 303/328] Import getProperties from @ember/object

---
 .../javascripts/admin/routes/admin-site-text-index.js.es6      | 3 ++-
 app/assets/javascripts/discourse-loader.js                     | 3 ++-
 app/assets/javascripts/discourse/models/user.js.es6            | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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.es6
index 2c0e365322..815dd1c084 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
@@ -1,5 +1,6 @@
 import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
+import { getProperties } from "@ember/object";
 
 export default Route.extend({
   queryParams: {
@@ -10,7 +11,7 @@ export default Route.extend({
   model(params) {
     return this.store.find(
       "site-text",
-      Ember.getProperties(params, "q", "overridden")
+      getProperties(params, "q", "overridden")
     );
   },
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 199f6374a9..d6f2171dd7 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -13,7 +13,8 @@ var define, requirejs;
       },
       "@ember/object": {
         default: Ember.Object,
-        get: Ember.get
+        get: Ember.get,
+        getProperties: Ember.getProperties
       },
       "@ember/object/computed": {
         default: Ember.computed,
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index b3148b4c0c..6ce6bf90cd 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -23,6 +23,7 @@ import PreloadStore from "preload-store";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
+import { getProperties } from "@ember/object";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -350,7 +351,7 @@ const User = RestModel.extend({
     })
       .then(result => {
         this.set("bio_excerpt", result.user.bio_excerpt);
-        const userProps = Ember.getProperties(
+        const userProps = getProperties(
           this.user_option,
           "enable_quoting",
           "enable_defer",

From 8a59225355316958f6543757eab8012ae5220e51 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 4 Nov 2019 15:15:46 -0500
Subject: [PATCH 304/328] FIX: Do not update created_at date when resending
 invites

---
 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 597ef010d9..17a998d4a2 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -233,7 +233,7 @@ class Invite < ActiveRecord::Base
   end
 
   def resend_invite
-    self.update_columns(created_at: Time.zone.now, updated_at: Time.zone.now)
+    self.update_columns(updated_at: Time.zone.now)
     Jobs.enqueue(:invite_email, invite_id: self.id)
   end
 

From b6d140e4bd4ece15b9162f490ed36e9ce74cda69 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 4 Nov 2019 16:51:18 -0500
Subject: [PATCH 305/328] UX: tag input suggests required tags if none have
 been selected

This is a follow-up to the new feature that allows a category to
require a certain number of tags from a tag group. The tag input will
shows results from the required group if none have been chosen yet.
Once a require tag is selected, the tag input will include other
results as usual. Staff users can ignore this restriction, so the input
behaviour is unchanged for them.
---
 lib/discourse_tagging.rb                  |  7 +++
 spec/components/discourse_tagging_spec.rb | 44 +++++++++++++++++
 spec/integration/category_tag_spec.rb     | 57 +++++++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index de6592c265..1ef8da2abc 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -165,6 +165,13 @@ module DiscourseTagging
     # Filters for category-specific tags:
     category = opts[:category]
 
+    if opts[:for_input] && !guardian.nil? && !guardian.is_staff? && category&.required_tag_group
+      required_tag_ids = category.required_tag_group.tags.pluck(:id)
+      if (required_tag_ids & selected_tag_ids).size < category.min_tags_from_required_group
+        query = query.where('tags.id IN (?)', required_tag_ids)
+      end
+    end
+
     if category && (category.tags.count > 0 || category.tag_groups.count > 0)
       if category.allow_global_tags
         # Select tags that:
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
index 8aeb04f9ae..7605b09fa5 100644
--- a/spec/components/discourse_tagging_spec.rb
+++ b/spec/components/discourse_tagging_spec.rb
@@ -57,6 +57,50 @@ describe DiscourseTagging do
           expect(tags.size).to eq(3)
         end
       end
+
+      context 'with required tags from tag group' do
+        fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2]) }
+        fab!(:category) { Fabricate(:category, required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+        it "returns the required tags if none have been selected" do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user),
+            for_input: true,
+            category: category,
+            term: 'fun'
+          ).to_a
+          expect(tags).to contain_exactly(tag1, tag2)
+        end
+
+        it "returns all allowed tags if a required tag is selected" do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user),
+            for_input: true,
+            category: category,
+            selected_tags: [tag1.name],
+            term: 'fun'
+          ).to_a
+          expect(tags).to contain_exactly(tag2, tag3)
+        end
+
+        it "returns required tags if not enough are selected" do
+          category.update!(min_tags_from_required_group: 2)
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user),
+            for_input: true,
+            category: category,
+            selected_tags: [tag1.name],
+            term: 'fun'
+          ).to_a
+          expect(tags).to contain_exactly(tag2)
+        end
+
+        it "let's staff ignore the requirement" do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(admin),
+            for_input: true,
+            category: category,
+            term: 'fun'
+          ).to_a
+          expect(tags).to contain_exactly(tag1, tag2, tag3)
+        end
+      end
     end
   end
 
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
index 9fddfb35cc..60ea91bbb3 100644
--- a/spec/integration/category_tag_spec.rb
+++ b/spec/integration/category_tag_spec.rb
@@ -71,6 +71,17 @@ describe "category tag restrictions" do
       expect { other_category.update(allowed_tags: [tag1.name, 'tag-stuff', tag2.name, 'another-tag']) }.to change { Tag.count }.by(2)
     end
 
+    context 'required tags from tag group' do
+      fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag3]) }
+      before { category_with_tags.update!(required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+      it "search only returns the allowed tags" do
+        expect(filter_allowed_tags(for_input: true, category: category_with_tags)).to contain_exactly(tag1)
+        expect(filter_allowed_tags(for_input: true, category: category_with_tags, selected_tags: [tag1.name])).to contain_exactly(tag2)
+        expect(filter_allowed_tags(for_input: true, category: category_with_tags, selected_tags: [tag2.name])).to contain_exactly(tag1)
+      end
+    end
+
     context 'category allows other tags to be used' do
       before do
         category_with_tags.update!(allow_global_tags: true)
@@ -93,6 +104,17 @@ describe "category tag restrictions" do
         expect(filter_allowed_tags(for_input: true, category: other_category, selected_tags: [tag3.name])).to contain_exactly(tag4)
         expect(filter_allowed_tags(for_input: true, category: other_category, selected_tags: [tag3.name], term: 'tag')).to contain_exactly(tag4)
       end
+
+      context 'required tags from tag group' do
+        fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag3]) }
+        before { category_with_tags.update!(required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+        it "search only returns the allowed tags" do
+          expect(filter_allowed_tags(for_input: true, category: category_with_tags)).to contain_exactly(tag1, tag3)
+          expect(filter_allowed_tags(for_input: true, category: category_with_tags, selected_tags: [tag1.name])).to contain_exactly(tag2, tag3, tag4)
+          expect(filter_allowed_tags(for_input: true, category: category_with_tags, selected_tags: [tag2.name])).to contain_exactly(tag1, tag3)
+        end
+      end
     end
   end
 
@@ -131,6 +153,17 @@ describe "category tag restrictions" do
       expect(post.topic.tags.map(&:name)).to eq([tag1.name])
     end
 
+    context 'required tags from tag group' do
+      fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag3]) }
+      before { category.update!(required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+      it "search only returns the allowed tags" do
+        expect(filter_allowed_tags(for_input: true, category: category)).to contain_exactly(tag1)
+        expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag1.name])).to contain_exactly(tag2)
+        expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag2.name])).to contain_exactly(tag1)
+      end
+    end
+
     context 'category allows other tags to be used' do
       before do
         category.update!(allow_global_tags: true)
@@ -154,6 +187,17 @@ describe "category tag restrictions" do
         expect(filter_allowed_tags(for_input: true, category: other_category)).to contain_exactly(tag1)
       end
 
+      context 'required tags from tag group' do
+        fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag3]) }
+        before { category.update!(required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+        it "search only returns the allowed tags" do
+          expect(filter_allowed_tags(for_input: true, category: category)).to contain_exactly(tag1, tag3)
+          expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag1.name])).to contain_exactly(tag2, tag3, tag4)
+          expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag2.name])).to contain_exactly(tag1, tag3)
+        end
+      end
+
       context 'another category has restricted tags using groups' do
         fab!(:category2) { Fabricate(:category) }
         fab!(:tag_group2) { Fabricate(:tag_group) }
@@ -229,6 +273,19 @@ describe "category tag restrictions" do
       expect(filter_allowed_tags(for_input: true, selected_tags: [tag3.name])).to contain_exactly(tag4, tag1, common)
     end
 
+    context 'required tags from tag group' do
+      fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2]) }
+      fab!(:category) { Fabricate(:category, required_tag_group: tag_group, min_tags_from_required_group: 1) }
+
+      it "search only returns the allowed tags" do
+        tag_group_with_parent = Fabricate(:tag_group, parent_tag_id: tag1.id, tags: [tag3, tag4])
+        expect(filter_allowed_tags(for_input: true, category: category)).to contain_exactly(tag1, tag2)
+        expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag2.name])).to contain_exactly(tag1)
+        expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag1.name])).to contain_exactly(tag2, tag3, tag4)
+        expect(filter_allowed_tags(for_input: true, category: category, selected_tags: [tag1.name, tag2.name])).to contain_exactly(tag3, tag4)
+      end
+    end
+
     context "and category restrictions" do
       fab!(:car_category)    { Fabricate(:category) }
       fab!(:other_category)  { Fabricate(:category) }

From 4b43816bb662f807f9c91e760f5e0121399c596e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 4 Nov 2019 22:16:31 -0500
Subject: [PATCH 306/328] FIX: Skip composer blur event when switching apps in
 iOS

---
 .../javascripts/discourse/lib/safari-hacks.js.es6   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index ac64d26461..257a704c13 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -112,9 +112,15 @@ 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:
+    // - switching to another iOS app
+    // - invoking a select-kit dropdown
+    // - invoking mentions
+    // - invoking a toolbar button
     if (
       lastTouchedElement &&
-      ($(lastTouchedElement).hasClass("select-kit-header") ||
+      (document.visibilityState === "hidden" ||
+        $(lastTouchedElement).hasClass("select-kit-header") ||
         $(lastTouchedElement).closest(".autocomplete").length ||
         ["span", "svg", "button"].includes(
           lastTouchedElement.nodeName.toLowerCase()
@@ -227,6 +233,11 @@ function positioningWorkaround($fixedElement) {
   };
   const observer = new MutationObserver(checkForInputs);
   observer.observe(fixedElement, config);
+
+  // document.addEventListener("visibilitychange", () => {
+  //   console.log(document.visibilityState);
+  //   console.log(lastTouchedElement);
+  // });
 }
 
 export default positioningWorkaround;

From 2b3e248927076732d20204537a0c7fbbcf7d4bcf Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 5 Nov 2019 16:15:27 +1100
Subject: [PATCH 307/328] FIX: on mobile setting active on navItem would not
 work

navigation bar would not have the current nav item selected when it overrode
---
 .../discourse/components/navigation-bar.js.es6            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index bf2947fc1d..eb8cb454b3 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -22,9 +22,11 @@ export default Component.extend({
     if (filterMode.indexOf("top/") === 0) {
       filterMode = "top";
     }
-    var item = navItems.find(
-      i => i.get("filterMode").indexOf(filterMode) === 0
-    );
+    let item = navItems.find(i => i.active === true);
+
+    item =
+      item || navItems.find(i => i.get("filterMode").indexOf(filterMode) === 0);
+
     if (!item) {
       let connectors = this.connectors;
       let category = this.category;

From 550212810542445267f995acf74862e8a54b0c68 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 5 Nov 2019 16:26:32 +1100
Subject: [PATCH 308/328] DEV: Remove uneeded comment

followup to 4b43816b
---
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 257a704c13..afb55f7f8b 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -233,11 +233,6 @@ function positioningWorkaround($fixedElement) {
   };
   const observer = new MutationObserver(checkForInputs);
   observer.observe(fixedElement, config);
-
-  // document.addEventListener("visibilitychange", () => {
-  //   console.log(document.visibilityState);
-  //   console.log(lastTouchedElement);
-  // });
 }
 
 export default positioningWorkaround;

From 8e419a772f1ca8c184dde57c9f8454f1a9e88d11 Mon Sep 17 00:00:00 2001
From: Joe <johani@discourse.org>
Date: Tue, 5 Nov 2019 18:40:02 +0800
Subject: [PATCH 309/328] FIX: improve regex used for image sizing controls
 (#8291)

---
 .../components/composer-editor.js.es6         | 23 ++++++--
 .../acceptance/composer-test.js.es6           | 57 ++++++++++++-------
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 8042d248da..876851b658 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -836,7 +836,11 @@ export default Component.extend({
           return;
         }
 
-        const replacement = match.replace(imageScaleRegex, `$1,${scale}%$3`);
+        const replacement = match.replace(
+          imageScaleRegex,
+          `![$1|$2, ${scale}%]($4)`
+        );
+
         this.appEvents.trigger(
           "composer:replace-text",
           matchingPlaceholder[index],
@@ -851,11 +855,18 @@ export default Component.extend({
     // regex matches only upload placeholders with size defined,
     // which is required for resizing
 
-    // original string `![28|690x226,5%](upload://ceEfx3vO7bx7Cecv2co1SrnoTpW.png)`
-    // match 1 `![28|690x226`
-    // match 2 `5`
-    // match 3 `](upload://ceEfx3vO7bx7Cecv2co1SrnoTpW.png)`
-    const imageScaleRegex = /(!\[(?:\S*?(?=\|)\|)*?(?:\d{1,6}x\d{1,6})+?)(?:,?(\d{1,3})?%?)?(\]\(upload:\/\/\S*?\))/g;
+    // original string `![image|690x220, 50%](upload://1TjaobgKObzpU7xRMw2HuUc87vO.png "image title")`
+    // group 1 `image`
+    // group 2 `690x220`
+    // group 3 `, 50%`
+    // group 4 'upload://1TjaobgKObzpU7xRMw2HuUc87vO.png'
+    // group 4 'upload://1TjaobgKObzpU7xRMw2HuUc87vO.png "image title"'
+
+    // Notes:
+    // Group 3 is optional. group 4 can match images with or without a markdown title.
+    // All matches are whitespace tolerant as long it's still valid markdown
+
+    const imageScaleRegex = /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?\]\((upload:\/\/.*?)\)/g;
 
     // wraps previewed upload markdown in a codeblock in its own class to keep a track
     // of indexes later on to replace the correct upload placeholder in the composer
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 39573aa31b..655df95357 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -721,49 +721,68 @@ QUnit.test("Image resizing buttons", async assert => {
   await click("#create-topic");
 
   let uploads = [
+    // 0 Default markdown with dimensions- should work
     "![test|690x313](upload://test.png)",
-    "[img]http://example.com/image.jpg[/img]",
-    "![anotherOne|690x463](upload://anotherOne.jpeg)",
-    "![](upload://withoutAltAndSize.jpeg)",
+    // 1 Image with scaling percentage, should work
+    "![test|690x313,50%](upload://test.png)",
+    // 2 image with scaling percentage and a proceeding whitespace, should work
+    "![test|690x313, 50%](upload://test.png)",
+    // 3 No dimensions, should not work
+    "![test](upload://test.jpeg)",
+    // 4 Wrapped in backquetes should not work
     "`![test|690x313](upload://test.png)`",
-    "![withoutSize](upload://withoutSize.png)",
+    // 5 html image - should not work
     "<img src='http://someimage.jpg' wight='20' height='20'>",
+    // 6 two images one the same line, but both are syntactically correct - both should work
     "![onTheSameLine1|200x200](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)",
+    // 7 & 8 Identical images - both should work
     "![identicalImage|300x300](upload://identicalImage.png)",
-    "![identicalImage|300x300](upload://identicalImage.png)"
+    "![identicalImage|300x300](upload://identicalImage.png)",
+    // 9 Image with whitespaces in alt - should work
+    "![image with spaces in alt|690x220](upload://test.png)",
+    // 10 Image with markdown title - should work
+    `![image|690x220](upload://test.png "image title")`,
+    // 11 bbcode - should not work
+    "[img]http://example.com/image.jpg[/img]"
   ];
 
   await fillIn(".d-editor-input", uploads.join("\n"));
 
   assert.ok(
-    find(".button-wrapper").length === 6,
+    find(".button-wrapper").length === 9,
     "it adds correct amount of scaling button groups"
   );
 
-  uploads[0] = "![test|690x313,50%](upload://test.png)";
+  // Default
+  uploads[0] = "![test|690x313, 50%](upload://test.png)";
   await click(find(".button-wrapper .scale-btn[data-scale='50']")[0]);
   assertImageResized(assert, uploads);
 
-  uploads[2] = "![anotherOne|690x463,75%](upload://anotherOne.jpeg)";
-  await click(find(".button-wrapper .scale-btn[data-scale='75']")[1]);
+  // Targets the correct image if two on the same line
+  uploads[6] =
+    "![onTheSameLine1|200x200, 50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)";
+  await click(find(".button-wrapper .scale-btn[data-scale='50']")[3]);
   assertImageResized(assert, uploads);
 
-  uploads[7] =
-    "![onTheSameLine1|200x200,50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)";
-  await click(find(".button-wrapper .scale-btn[data-scale='50']")[2]);
+  // Try the other image on the same line
+  uploads[6] =
+    "![onTheSameLine1|200x200, 50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250, 75%](upload://onTheSameLine2.jpeg)";
+  await click(find(".button-wrapper .scale-btn[data-scale='75']")[4]);
   assertImageResized(assert, uploads);
 
-  uploads[7] =
-    "![onTheSameLine1|200x200,50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250,75%](upload://onTheSameLine2.jpeg)";
-  await click(find(".button-wrapper .scale-btn[data-scale='75']")[3]);
+  // Make sure we target the correct image if there are duplicates
+  uploads[7] = "![identicalImage|300x300, 50%](upload://identicalImage.png)";
+  await click(find(".button-wrapper .scale-btn[data-scale='50']")[5]);
   assertImageResized(assert, uploads);
 
-  uploads[8] = "![identicalImage|300x300,50%](upload://identicalImage.png)";
-  await click(find(".button-wrapper .scale-btn[data-scale='50']")[4]);
+  // Try the other dupe
+  uploads[8] = "![identicalImage|300x300, 75%](upload://identicalImage.png)";
+  await click(find(".button-wrapper .scale-btn[data-scale='75']")[6]);
   assertImageResized(assert, uploads);
 
-  uploads[9] = "![identicalImage|300x300,75%](upload://identicalImage.png)";
-  await click(find(".button-wrapper .scale-btn[data-scale='75']")[5]);
+  // Don't mess with image titles
+  uploads[10] = `![image|690x220, 75%](upload://test.png "image title")`;
+  await click(find(".button-wrapper .scale-btn[data-scale='75']")[8]);
   assertImageResized(assert, uploads);
 
   await fillIn(

From c008443f2d668f270415f907f1818f458814d646 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 5 Nov 2019 11:24:52 +0000
Subject: [PATCH 310/328] FIX: filterQueryParams mutates state that is
 essentially global

Let's prevent it from doing this by duplicating the input first.
---
 .../javascripts/discourse/routes/build-topic-route.js.es6      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index e892876dfe..fb4249205d 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -4,7 +4,8 @@ import { defaultHomepage } from "discourse/lib/utilities";
 
 // A helper to build a topic route for a filter
 function filterQueryParams(params, defaultParams) {
-  const findOpts = defaultParams || {};
+  const findOpts = Object.assign({}, defaultParams || {});
+
   if (params) {
     Object.keys(queryParams).forEach(function(opt) {
       if (params[opt]) {

From ee5799805c1f173f348825cc31ee95ece1933262 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 5 Nov 2019 11:54:12 +0000
Subject: [PATCH 311/328] FIX: Allow theme translations to be accessed in
 initializers (#8285)

Previously theme translations were loaded along with other plugin API scripts. These run after pre-initializers and initializers when the app boots. This commit moves theme translation loading into pre-initializers, so their behaviour matches core translations more closely.
---
 app/models/theme_field.rb        | 25 +++++++++++++++----------
 lib/theme_javascript_compiler.rb |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ee94014585..38c19da7bb 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 = 13
+  BASE_COMPILER_VERSION = 14
   DEPENDENT_CONSTANTS = [BASE_COMPILER_VERSION,
                         GlobalSetting.cdn_url]
   COMPILER_VERSION = Digest::SHA1.hexdigest(DEPENDENT_CONSTANTS.join)
@@ -181,19 +181,24 @@ class ThemeField < ActiveRecord::Base
       data = translation_data
 
       js = <<~JS
-        /* Translation data for theme #{self.theme_id} (#{self.name})*/
-        const data = #{data.to_json};
+        export default {
+          name: "theme-#{theme_id}-translations",
+          initialize() {
+            /* Translation data for theme #{self.theme_id} (#{self.name})*/
+            const data = #{data.to_json};
 
-        for (let lang in data){
-          let cursor = I18n.translations;
-          for (let key of [lang, "js", "theme_translations"]){
-            cursor = cursor[key] = cursor[key] || {};
+            for (let lang in data){
+              let cursor = I18n.translations;
+              for (let key of [lang, "js", "theme_translations"]){
+                cursor = cursor[key] = cursor[key] || {};
+              }
+              cursor[#{self.theme_id}] = data[lang];
+            }
           }
-          cursor[#{self.theme_id}] = data[lang];
-        }
+        };
       JS
 
-      js_compiler.append_plugin_script(js, 0)
+      js_compiler.append_module(js, "discourse/pre-initializers/theme-#{theme_id}-translations", include_variables: false)
     rescue ThemeTranslationParser::InvalidYaml => e
       errors << e.message
     end
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index c11f1aa5e4..5371fa1e77 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -208,8 +208,8 @@ class ThemeJavascriptCompiler
     @content << script + "\n"
   end
 
-  def append_module(script, name)
-    script.prepend theme_variables
+  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)
   rescue MiniRacer::RuntimeError => ex

From 671f303b5355d2da239d20cfad6032ef74084301 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 5 Nov 2019 18:15:55 +0530
Subject: [PATCH 312/328] FEATURE: Add welcome message for admins. (#8293)

---
 .../admin/email_templates_controller.rb            |  1 +
 app/models/concerns/roleable.rb                    |  3 ++-
 app/models/user.rb                                 | 14 +++++++++++---
 config/locales/server.en.yml                       | 10 +++++-----
 spec/components/admin_confirmation_spec.rb         |  1 +
 spec/requests/admin/users_controller_spec.rb       |  1 +
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index 9a3f8ea78e..d1b06c830e 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -43,6 +43,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
       "system_messages.user_automatically_silenced",
       "system_messages.welcome_invite",
       "system_messages.welcome_user",
+      "system_messages.welcome_staff",
       "test_mailer",
       "user_notifications.account_created",
       "user_notifications.admin_login",
diff --git a/app/models/concerns/roleable.rb b/app/models/concerns/roleable.rb
index 0706269240..b1f15d4996 100644
--- a/app/models/concerns/roleable.rb
+++ b/app/models/concerns/roleable.rb
@@ -20,7 +20,7 @@ module Roleable
 
   def grant_moderation!
     set_permission('moderator', true)
-    enqueue_welcome_moderator_message
+    enqueue_staff_welcome_message(:moderator)
   end
 
   def revoke_moderation!
@@ -29,6 +29,7 @@ module Roleable
 
   def grant_admin!
     set_permission('admin', true)
+    enqueue_staff_welcome_message(:admin)
   end
 
   def revoke_admin!
diff --git a/app/models/user.rb b/app/models/user.rb
index aa5ac937a0..adaf9ee9bb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -416,9 +416,17 @@ class User < ActiveRecord::Base
     Jobs.enqueue(:send_system_message, user_id: id, message_type: "welcome_tl1_user")
   end
 
-  def enqueue_welcome_moderator_message
-    return unless moderator
-    Jobs.enqueue(:send_system_message, user_id: id, message_type: 'welcome_moderator')
+  def enqueue_staff_welcome_message(role)
+    return unless staff?
+
+    Jobs.enqueue(
+      :send_system_message,
+      user_id: id,
+      message_type: 'welcome_staff',
+      message_options: {
+        role: role
+      }
+    )
   end
 
   def change_username(new_username, actor = nil)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index bdebcbbdd5..b1619c47d4 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2677,13 +2677,13 @@ en:
 
         We’re really glad you’re spending time with us and we’d love to know more about you. Take a moment to [fill out your profile](%{base_url}/my/preferences/profile), or feel free to [start a new topic](%{base_url}/categories).
 
-    welcome_moderator:
-      title: "Welcome Moderator"
-      subject_template: "Congratulations, you’re now a moderator!"
+    welcome_staff:
+      title: "Welcome Staff"
+      subject_template: "Congratulations, you’re now a %{role}!"
       text_body_template: |
-        You’ve been granted moderator status by a fellow staff member.
+        You’ve been granted %{role} status by a fellow staff member.
 
-        As a moderator, you now have access to the <a href='%{base_url}/admin' target='_blank'>admin interface</a>.
+        As a %{role}, you now have access to the <a href='%{base_url}/admin' target='_blank'>admin interface</a>.
 
         With great power comes great responsibility. If you’re new to moderating, please refer to the [Moderation Guide](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
diff --git a/spec/components/admin_confirmation_spec.rb b/spec/components/admin_confirmation_spec.rb
index 1c09b8f236..749c566090 100644
--- a/spec/components/admin_confirmation_spec.rb
+++ b/spec/components/admin_confirmation_spec.rb
@@ -33,6 +33,7 @@ describe AdminConfirmation do
       expect(ac.performed_by).to eq(admin)
       expect(ac.target_user).to eq(user)
       expect(ac.token).to eq(@token)
+      Jobs.expects(:enqueue).with(:send_system_message, user_id: user.id, message_type: 'welcome_staff', message_options: { role: :admin })
       ac.email_confirmed!
 
       user.reload
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 9a3d280b48..e6bf9831d2 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -426,6 +426,7 @@ RSpec.describe Admin::UsersController do
     end
 
     it 'updates the moderator flag' do
+      Jobs.expects(:enqueue).with(:send_system_message, user_id: another_user.id, message_type: 'welcome_staff', message_options: { role: :moderator })
       put "/admin/users/#{another_user.id}/grant_moderation.json"
       expect(response.status).to eq(200)
       another_user.reload

From fa2c06da936e7529a2491694212b8e059569a204 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Sun, 3 Nov 2019 16:32:31 +0000
Subject: [PATCH 313/328] DEV: Change tag routing for categories on the
 server-side

These are the changes to tags routing that correspond to the category
routing changes of d84c34ad. The new scheme is:

/tags/c/*slug_path/:id/none/:tag_id/ENDPOINT
/tags/c/*slug_path/:id/none/:tag_id
/tags/c/*slug_path/:id/:tag_id/ENDPOINT
/tags/c/*slug_path/:id/:tag_id
---
 app/controllers/tags_controller.rb | 69 ++++++++++++++++++++++--------
 config/routes.rb                   | 20 ++++++---
 2 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 9e2cfde202..8aabc8f3db 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -293,29 +293,52 @@ class TagsController < ::ApplicationController
   end
 
   def set_category_from_params
-    slug_or_id = params[:category]
-    return true if slug_or_id.nil?
+    if request.path_parameters.include?(:category_slug_path_with_id)
+      parts = params[:category_slug_path_with_id].split('/')
 
-    parent_slug_or_id = params[:parent_category]
+      if !parts.empty? && parts.last =~ /\A\d+\Z/
+        id = parts.pop.to_i
+      end
+      slug_path = parts unless parts.empty?
 
-    parent_category_id = nil
-    if parent_slug_or_id.present?
-      parent_category_id = Category.query_parent_category(parent_slug_or_id)
-      category_redirect_or_not_found && (return) if parent_category_id.blank?
+      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
+
+        # Legacy paths
+        if @filter_on_category.nil? && parts.last =~ /\A\d+-/
+          @filter_on_category = Category.find_by_id(parts.last.to_i)
+        end
+      end
+    else
+      slug_or_id = params[:category]
+      return true if slug_or_id.nil?
+
+      @filter_on_category = Category.query_category(slug_or_id, nil)
     end
 
-    @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
-
     category_redirect_or_not_found && (return) if !@filter_on_category
 
     guardian.ensure_can_see!(@filter_on_category)
   end
 
-  # TODO: this is duplication of ListController
   def page_params
     route_params = { format: 'json' }
-    route_params[:category]        = @filter_on_category.slug_for_url                 if @filter_on_category
-    route_params[:parent_category] = @filter_on_category.parent_category.slug_for_url if @filter_on_category && @filter_on_category.parent_category
+
+    if @filter_on_category
+      if request.path_parameters.include?(:category_slug_path_with_id)
+        slug_path = @filter_on_category.slug_path
+
+        route_params[:category_slug_path_with_id] =
+          (slug_path + [@filter_on_category.id.to_s]).join("/")
+      else
+        route_params[:category] = @filter_on_category.slug_for_url
+      end
+    end
+
     route_params
   end
 
@@ -345,15 +368,27 @@ class TagsController < ::ApplicationController
   def construct_url_with(action, opts)
     method = url_method(opts)
 
-    begin
-      url = if action == :prev
-        public_send(method, opts.merge(prev_page_params))
-      else # :next
-        public_send(method, opts.merge(next_page_params))
+    page_params =
+      case action
+      when :prev
+        prev_page_params
+      when :next
+        next_page_params
+      else
+        raise "unreachable"
       end
+
+    if page_params.include?(:category_slug_path_with_id)
+      opts = opts.dup
+      opts.delete(:category)
+    end
+
+    begin
+      url = public_send(method, opts.merge(page_params))
     rescue ActionController::UrlGenerationError
       raise Discourse::NotFound
     end
+
     url.sub('.json?', '?')
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index bc66be9ecf..81cc8d095e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -836,11 +836,22 @@ Discourse::Application.routes.draw do
     get '/unused' => 'tags#list_unused'
     delete '/unused' => 'tags#destroy_unused'
     constraints(tag_id: /[^\/]+?/, format: /json|rss/) do
+      scope path: '/c/*category_slug_path_with_id' do
+        Discourse.filters.each do |filter|
+          get "/none/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_none_show_#{filter}", defaults: { no_subcategories: true }
+        end
+
+        get '/none/:tag_id' => 'tags#show', as: 'tag_category_none_show', defaults: { no_subcategories: true }
+
+        Discourse.filters.each do |filter|
+          get "/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_show_#{filter}"
+        end
+
+        get '/:tag_id' => 'tags#show', as: 'tag_category_show'
+      end
+
       get '/:tag_id.rss' => 'tags#tag_feed'
       get '/:tag_id' => 'tags#show', as: 'tag_show'
-      get '/c/:category/:tag_id' => 'tags#show', as: 'tag_category_show'
-      get '/c/:category/none/:tag_id' => 'tags#show', as: 'tag_category_none_show', defaults: { no_subcategories: true }
-      get '/c/:parent_category/:category/:tag_id' => 'tags#show', as: 'tag_parent_category_category_show'
       get '/intersection/:tag_id/*additional_tag_ids' => 'tags#show', as: 'tag_intersection'
       get '/:tag_id/notifications' => 'tags#notifications'
       put '/:tag_id/notifications' => 'tags#update_notifications'
@@ -849,9 +860,6 @@ Discourse::Application.routes.draw do
 
       Discourse.filters.each do |filter|
         get "/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_show_#{filter}"
-        get "/c/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_show_#{filter}"
-        get "/c/:category/none/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_none_show_#{filter}", defaults: { no_subcategories: true }
-        get "/c/:parent_category/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_parent_category_category_show_#{filter}"
       end
     end
   end

From 52c5cf33f87990a5828a34f68ff9df833cdc4a15 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 5 Nov 2019 14:10:23 +0000
Subject: [PATCH 314/328] FEATURE: Overhaul of admin API key system (#8284)

- Allow revoking keys without deleting them
- Auto-revoke keys after a period of no use (default 6 months)
- Allow multiple keys per user
- Allow attaching a description to each key, for easier auditing
- Log changes to keys in the staff action log
- Move all key management to one place, and improve the UI
---
 .../javascripts/admin/adapters/api-key.js.es6 |  11 ++
 .../controllers/admin-api-keys-index.js.es6   |  13 ++
 .../controllers/admin-api-keys-new.js.es6     |  39 ++++
 .../controllers/admin-api-keys-show.js.es6    |  54 ++++++
 .../admin/controllers/admin-api-keys.js.es6   |  42 -----
 .../admin/controllers/admin-user-index.js.es6 |  30 ---
 .../admin/models/admin-user.js.es6            |  11 --
 .../javascripts/admin/models/api-key.js.es6   |  74 ++++----
 .../admin/routes/admin-api-keys-index.js.es6  |   7 +
 .../admin/routes/admin-api-keys-new.es6       |   7 +
 .../admin/routes/admin-api-keys-show.js.es6   |   5 +
 .../admin/routes/admin-api-keys.js.es6        |  11 +-
 .../admin/routes/admin-route-map.js.es6       |   9 +-
 .../{api-keys.hbs => api-keys-index.hbs}      |  52 +++---
 .../admin/templates/api-keys-new.hbs          |  27 +++
 .../admin/templates/api-keys-show.hbs         |  80 ++++++++
 .../admin/templates/user-index.hbs            |  35 +---
 app/assets/stylesheets/common/admin/api.scss  |  59 +++++-
 app/controllers/admin/api_controller.rb       |  88 ++++++++-
 app/controllers/admin/users_controller.rb     |  13 --
 .../scheduled/clean_up_unused_api_keys.rb     |  14 ++
 app/models/api_key.rb                         |  43 +++--
 app/models/user.rb                            |  15 +-
 app/models/user_history.rb                    |  10 +-
 .../admin_detailed_user_serializer.rb         |   7 +-
 app/serializers/api_key_serializer.rb         |   5 +-
 app/services/staff_action_logger.rb           |  33 ++++
 app/services/user_anonymizer.rb               |   2 +-
 config/locales/client.en.yml                  |  27 ++-
 config/locales/server.en.yml                  |   7 +
 config/routes.rb                              |  11 +-
 config/site_settings.yml                      |   5 +
 ...0191101113230_add_revoked_at_to_api_key.rb |  17 ++
 lib/auth/default_current_user_provider.rb     |   2 +-
 .../default_current_user_provider_spec.rb     |  18 ++
 spec/models/api_key_spec.rb                   |  57 +++++-
 spec/models/user_spec.rb                      |  50 -----
 spec/requests/admin/api_controller_spec.rb    | 176 ++++++++++++++----
 spec/requests/admin/users_controller_spec.rb  |  40 ++--
 spec/requests/embed_controller_spec.rb        |   2 +-
 spec/requests/posts_controller_spec.rb        |  10 +-
 spec/requests/topics_controller_spec.rb       |   2 +-
 spec/requests/user_badges_controller_spec.rb  |   4 +-
 spec/services/user_anonymizer_spec.rb         |   2 +-
 .../admin/models/admin-user-test.js.es6       |  30 ---
 .../helpers/create-pretender.js.es6           |   2 -
 46 files changed, 863 insertions(+), 395 deletions(-)
 create mode 100644 app/assets/javascripts/admin/adapters/api-key.js.es6
 create mode 100644 app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6
 create mode 100644 app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
 create mode 100644 app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6
 create mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6
 create mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-new.es6
 create mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6
 rename app/assets/javascripts/admin/templates/{api-keys.hbs => api-keys-index.hbs} (55%)
 create mode 100644 app/assets/javascripts/admin/templates/api-keys-new.hbs
 create mode 100644 app/assets/javascripts/admin/templates/api-keys-show.hbs
 create mode 100644 app/jobs/scheduled/clean_up_unused_api_keys.rb
 create mode 100644 db/migrate/20191101113230_add_revoked_at_to_api_key.rb
 delete mode 100644 test/javascripts/admin/models/admin-user-test.js.es6

diff --git a/app/assets/javascripts/admin/adapters/api-key.js.es6 b/app/assets/javascripts/admin/adapters/api-key.js.es6
new file mode 100644
index 0000000000..a473f66e08
--- /dev/null
+++ b/app/assets/javascripts/admin/adapters/api-key.js.es6
@@ -0,0 +1,11 @@
+import RESTAdapter from "discourse/adapters/rest";
+
+export default RESTAdapter.extend({
+  basePath() {
+    return "/admin/api/";
+  },
+
+  apiNameFor() {
+    return "key";
+  }
+});
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.es6
new file mode 100644
index 0000000000..b087269626
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6
@@ -0,0 +1,13 @@
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default Ember.Controller.extend({
+  actions: {
+    revokeKey(key) {
+      key.revoke().catch(popupAjaxError);
+    },
+
+    undoRevokeKey(key) {
+      key.undoRevoke().catch(popupAjaxError);
+    }
+  }
+});
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
new file mode 100644
index 0000000000..f4d56c0a05
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
@@ -0,0 +1,39 @@
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default Ember.Controller.extend({
+  userModes: [
+    { id: "all", name: I18n.t("admin.api.all_users") },
+    { id: "single", name: I18n.t("admin.api.single_user") }
+  ],
+
+  @computed("userMode")
+  showUserSelector(mode) {
+    return mode === "single";
+  },
+
+  @computed("model.description", "model.username", "userMode")
+  saveDisabled(description, username, userMode) {
+    if (Ember.isBlank(description)) return true;
+    if (userMode === "single" && Ember.isBlank(username)) return true;
+    return false;
+  },
+
+  actions: {
+    changeUserMode(value) {
+      if (value === "all") {
+        this.model.set("username", null);
+      }
+      this.set("userMode", value);
+    },
+
+    save() {
+      this.model
+        .save()
+        .then(() => {
+          this.transitionToRoute("adminApiKeys.show", this.model.id);
+        })
+        .catch(popupAjaxError);
+    }
+  }
+});
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.es6
new file mode 100644
index 0000000000..2e19ea5779
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6
@@ -0,0 +1,54 @@
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { empty } from "@ember/object/computed";
+
+export default Ember.Controller.extend(bufferedProperty("model"), {
+  isNew: empty("model.id"),
+
+  actions: {
+    saveDescription() {
+      const buffered = this.buffered;
+      const attrs = buffered.getProperties("description");
+
+      this.model
+        .save(attrs)
+        .then(() => {
+          this.set("editingDescription", false);
+          this.rollbackBuffer();
+        })
+        .catch(popupAjaxError);
+    },
+
+    cancel() {
+      const id = this.get("userField.id");
+      if (Ember.isEmpty(id)) {
+        this.destroyAction(this.userField);
+      } else {
+        this.rollbackBuffer();
+        this.set("editing", false);
+      }
+    },
+
+    editDescription() {
+      this.toggleProperty("editingDescription");
+      if (!this.editingDescription) {
+        this.rollbackBuffer();
+      }
+    },
+
+    revokeKey(key) {
+      key.revoke().catch(popupAjaxError);
+    },
+
+    deleteKey(key) {
+      key
+        .destroyRecord()
+        .then(() => this.transitionToRoute("adminApiKeys.index"))
+        .catch(popupAjaxError);
+    },
+
+    undoRevokeKey(key) {
+      key.undoRevoke().catch(popupAjaxError);
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
index 9cd1682ff6..e69de29bb2 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
@@ -1,42 +0,0 @@
-import ApiKey from "admin/models/api-key";
-import { default as computed } from "ember-addons/ember-computed-decorators";
-import Controller from "@ember/controller";
-
-export default Controller.extend({
-  @computed("model.[]")
-  hasMasterKey(model) {
-    return !!model.findBy("user", null);
-  },
-
-  actions: {
-    generateMasterKey() {
-      ApiKey.generateMasterKey().then(key => this.model.pushObject(key));
-    },
-
-    regenerateKey(key) {
-      bootbox.confirm(
-        I18n.t("admin.api.confirm_regen"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        result => {
-          if (result) {
-            key.regenerate();
-          }
-        }
-      );
-    },
-
-    revokeKey(key) {
-      bootbox.confirm(
-        I18n.t("admin.api.confirm_revoke"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        result => {
-          if (result) {
-            key.revoke().then(() => this.model.removeObject(key));
-          }
-        }
-      );
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 9a25f679ef..47a54b8ebf 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -258,10 +258,6 @@ export default Controller.extend(CanCheckEmails, {
         .finally(() => this.toggleProperty("editingTitle"));
     },
 
-    generateApiKey() {
-      this.model.generateApiKey();
-    },
-
     saveCustomGroups() {
       const currentIds = this.customGroupIds;
       const bufferedIds = this.customGroupIdsBuffer;
@@ -294,32 +290,6 @@ export default Controller.extend(CanCheckEmails, {
 
     resetPrimaryGroup() {
       this.set("model.primary_group_id", this.originalPrimaryGroupId);
-    },
-
-    regenerateApiKey() {
-      bootbox.confirm(
-        I18n.t("admin.api.confirm_regen"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        result => {
-          if (result) {
-            this.model.generateApiKey();
-          }
-        }
-      );
-    },
-
-    revokeApiKey() {
-      bootbox.confirm(
-        I18n.t("admin.api.confirm_revoke"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        result => {
-          if (result) {
-            this.model.revokeApiKey();
-          }
-        }
-      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index 891a2923c6..e99c84e0b4 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -4,7 +4,6 @@ import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import ApiKey from "admin/models/api-key";
 import Group from "discourse/models/group";
 import { userPath } from "discourse/lib/url";
 
@@ -57,16 +56,6 @@ const AdminUser = Discourse.User.extend({
     );
   },
 
-  generateApiKey() {
-    return ajax(`/admin/users/${this.id}/generate_api_key`, {
-      type: "POST"
-    }).then(result => {
-      const apiKey = ApiKey.create(result.api_key);
-      this.set("api_key", apiKey);
-      return apiKey;
-    });
-  },
-
   groupAdded(added) {
     return ajax(`/admin/users/${this.id}/groups`, {
       type: "POST",
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js.es6
index 62a4e003bf..95d8e1914c 100644
--- a/app/assets/javascripts/admin/models/api-key.js.es6
+++ b/app/assets/javascripts/admin/models/api-key.js.es6
@@ -1,47 +1,55 @@
 import AdminUser from "admin/models/admin-user";
+import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
+import computed from "ember-addons/ember-computed-decorators";
 
-const KEY_ENDPOINT = "/admin/api/key";
-const KEYS_ENDPOINT = "/admin/api/keys";
+const ApiKey = RestModel.extend({
+  user: Ember.computed("_user", {
+    get() {
+      return this._user;
+    },
+    set(key, value) {
+      if (value && !(value instanceof AdminUser)) {
+        this.set("_user", AdminUser.create(value));
+      } else {
+        this.set("_user", value);
+      }
+      return this._user;
+    }
+  }),
 
-const ApiKey = Discourse.Model.extend({
-  regenerate() {
-    return ajax(KEY_ENDPOINT, {
-      type: "PUT",
-      data: { id: this.id }
-    }).then(result => {
-      this.set("key", result.api_key.key);
-      return this;
-    });
+  @computed("key")
+  shortKey(key) {
+    return `${key.substring(0, 4)}...`;
+  },
+
+  @computed("description")
+  shortDescription(description) {
+    if (!description || description.length < 40) return description;
+    return `${description.substring(0, 40)}...`;
   },
 
   revoke() {
-    return ajax(KEY_ENDPOINT, {
-      type: "DELETE",
-      data: { id: this.id }
-    });
-  }
-});
-
-ApiKey.reopenClass({
-  create() {
-    const result = this._super.apply(this, arguments);
-    if (result.user) {
-      result.user = AdminUser.create(result.user);
-    }
-    return result;
+    return ajax(`${this.basePath}/revoke`, {
+      type: "POST"
+    }).then(result => this.setProperties(result.api_key));
   },
 
-  find() {
-    return ajax(KEYS_ENDPOINT).then(keys =>
-      keys.map(key => ApiKey.create(key))
-    );
+  undoRevoke() {
+    return ajax(`${this.basePath}/undo-revoke`, {
+      type: "POST"
+    }).then(result => this.setProperties(result.api_key));
   },
 
-  generateMasterKey() {
-    return ajax(KEY_ENDPOINT, { type: "POST" }).then(result =>
-      ApiKey.create(result.api_key)
-    );
+  createProperties() {
+    return this.getProperties("description", "username");
+  },
+
+  @computed()
+  basePath() {
+    return this.store
+      .adapterFor("api-key")
+      .pathFor(this.store, "api-key", this.id);
   }
 });
 
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.es6
new file mode 100644
index 0000000000..25f6df3e4a
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6
@@ -0,0 +1,7 @@
+import Route from "@ember/routing/route";
+
+export default Route.extend({
+  model() {
+    return this.store.findAll("api-key");
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-new.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-new.es6
new file mode 100644
index 0000000000..3969615c9f
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-api-keys-new.es6
@@ -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/admin/routes/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6
new file mode 100644
index 0000000000..b21f2cd021
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Route.extend({
+  model(params) {
+    return this.store.find("api-key", params.api_key_id);
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
index 1826277567..1b3f3067fc 100644
--- a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
@@ -1,8 +1,13 @@
 import Route from "@ember/routing/route";
-import ApiKey from "admin/models/api-key";
 
 export default Route.extend({
-  model() {
-    return ApiKey.find();
+  actions: {
+    show(apiKey) {
+      this.transitionTo("adminApiKeys.show", apiKey.id);
+    },
+
+    new() {
+      this.transitionTo("adminApiKeys.new");
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
index 478a851d86..f90b66f97a 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -101,7 +101,14 @@ export default function() {
     );
 
     this.route("adminApi", { path: "/api", resetNamespace: true }, function() {
-      this.route("adminApiKeys", { path: "/keys", resetNamespace: true });
+      this.route(
+        "adminApiKeys",
+        { path: "/keys", resetNamespace: true },
+        function() {
+          this.route("show", { path: "/:api_key_id" });
+          this.route("new", { path: "/new" });
+        }
+      );
 
       this.route(
         "adminWebHooks",
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
similarity index 55%
rename from app/assets/javascripts/admin/templates/api-keys.hbs
rename to app/assets/javascripts/admin/templates/api-keys-index.hbs
index a1254f3042..19999029ea 100644
--- a/app/assets/javascripts/admin/templates/api-keys.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -1,7 +1,14 @@
+{{d-button
+  class="btn-primary"
+  action=(route-action "new")
+  icon="plus"
+  label="admin.api.new_key"}}
+
 {{#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>
@@ -9,8 +16,14 @@
   </thead>
   <tbody>
     {{#each model as |k|}}
-      <tr>
-        <td class="key">{{k.key}}</td>
+      <tr class={{if k.revoked_at "revoked"}}>
+        <td class="key">
+          {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+          {{k.shortKey}}
+        </td>
+        <td class="key-description">
+          {{k.shortDescription}}
+        </td>
         <td class="key-user">
           <div class="label">{{i18n 'admin.api.user'}}</div>
           {{#if k.user}}
@@ -34,17 +47,21 @@
           {{/if}}
         </td>
         <td class="key-controls">
-          {{d-button
-            class="btn-default"
-            action=(action "regenerateKey")
-            actionParam=k icon="undo"
-            label="admin.api.regenerate"}}
-          {{d-button
-            class="btn-default"
-            action=(action "revokeKey")
-            actionParam=k
-            icon="times"
-            label="admin.api.revoke"}}
+          {{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}}
@@ -52,11 +69,4 @@
   </table>
 {{else}}
   <p>{{i18n "admin.api.none"}}</p>
-{{/if}}
-
-{{#unless hasMasterKey}}
-  {{d-button
-    class="btn-primary"
-    action=(action "generateMasterKey")
-    icon="key"}}
-{{/unless}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/api-keys-new.hbs b/app/assets/javascripts/admin/templates/api-keys-new.hbs
new file mode 100644
index 0000000000..15f25b1ce1
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/api-keys-new.hbs
@@ -0,0 +1,27 @@
+{{#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.description"}}
+    {{input value=model.description maxlength="255" placeholder=(i18n "admin.api.description_placeholder")}}
+  {{/admin-form-row}}
+
+  {{#admin-form-row label="admin.api.user_mode"}}
+    {{combo-box content=userModes value=userMode onSelect=(action "changeUserMode")}}
+  {{/admin-form-row}}
+
+  {{#if showUserSelector}}
+    {{#admin-form-row label="admin.api.user"}}
+      {{user-selector single="true"
+        usernames=model.username
+        placeholderKey="admin.api.user_placeholder"
+        }}  
+    {{/admin-form-row}}
+  {{/if}}
+
+  {{#admin-form-row}}
+    {{d-button icon="check" label="admin.api.save" action=(action "save") class="btn-primary" disabled=saveDisabled}}
+  {{/admin-form-row}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/api-keys-show.hbs b/app/assets/javascripts/admin/templates/api-keys-show.hbs
new file mode 100644
index 0000000000..a742cf994a
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/api-keys-show.hbs
@@ -0,0 +1,80 @@
+{{#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}}
+    {{model.key}}
+  {{/admin-form-row}}
+
+  {{#admin-form-row label="admin.api.description"}}
+    {{#if editingDescription}}
+      {{input value=buffered.description maxlength="255" placeholder=(i18n "admin.api.description_placeholder")}}
+    {{else}}
+      <span {{action "editDescription"}}>{{if model.description model.description (i18n "admin.api.no_description")}}</span>
+    {{/if}}
+
+    <div class='controls'>
+      {{#if editingDescription}}
+        {{d-button class="ok" action=(action "saveDescription") icon="check"}}
+        {{d-button class="cancel" action=(action "editDescription") icon="times"}}
+      {{else}}
+        {{d-button class="btn-default" action=(action "editDescription") icon="pencil-alt"}}
+      {{/if}}
+    </div>
+  {{/admin-form-row}}
+
+  {{#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}}
+    {{else}}
+        {{i18n "admin.api.all_users"}}
+    {{/if}}
+  {{/admin-form-row}}
+
+  {{#admin-form-row label="admin.api.created"}}
+    {{format-date model.created_at leaveAgo="true"}}
+  {{/admin-form-row}}
+
+  {{#admin-form-row label="admin.api.updated"}}
+    {{format-date model.updated_at leaveAgo="true"}}
+  {{/admin-form-row}}
+
+  {{#admin-form-row label="admin.api.last_used"}}
+    {{#if k.last_used_at}}
+      {{format-date k.last_used_at leaveAgo="true"}}
+    {{else}}
+      {{i18n "admin.api.never_used"}}
+    {{/if}}
+  {{/admin-form-row}}
+
+  {{#admin-form-row label="admin.api.revoked"}}
+    {{#if model.revoked_at}}
+      {{format-date model.revoked_at leaveAgo="true"}}
+    {{/if}}
+    <div class='controls'>
+      {{#if model.revoked_at}}
+        {{d-button
+          action=(action "undoRevokeKey")
+          actionParam=model icon="undo"
+          label="admin.api.undo_revoke"}}
+        {{d-button
+          action=(action "deleteKey")
+          actionParam=model icon="trash"
+          label="admin.api.delete"
+          class="btn-danger"}}
+      {{else}}
+        {{d-button
+          class="btn-danger"
+          action=(action "revokeKey")
+          actionParam=model
+          icon="times"
+          label="admin.api.revoke"}}
+      {{/if}}
+    </div>
+  {{/admin-form-row}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 6166eb1b9a..7eb9504fb5 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -292,33 +292,14 @@
 
   {{#if currentUser.admin}}
     <div class="display-row">
-      <div class="field">{{i18n "admin.api.key"}}</div>
-      {{#if model.api_key}}
-        <div class="long-value">
-          {{model.api_key.key}}
-          {{d-button
-            class="btn-default"
-            action=(action "regenerateApiKey")
-            icon="undo"
-            label="admin.api.regenerate"}}
-          {{d-button
-            class="btn-default"
-            action=(action "revokeApiKey")
-            icon="times"
-            label="admin.api.revoke"}}
-        </div>
-      {{else}}
-        <div class="value">
-          &mdash;
-        </div>
-        <div class="controls">
-          {{d-button
-            class="btn-default"
-            action=(action "generateApiKey")
-            icon="key"
-            label="admin.api.generate"}}
-        </div>
-      {{/if}}
+      <div class="field">{{i18n "admin.api.active_keys"}}</div>
+      <div class="value">
+        {{model.api_key_count}}
+      </div>
+      <div class="controls">
+        {{d-button href="/admin/api/keys" label="admin.api.manage_keys"}}
+        
+      </div>
     </div>
   {{/if}}
 
diff --git a/app/assets/stylesheets/common/admin/api.scss b/app/assets/stylesheets/common/admin/api.scss
index e2a921d585..ece2277a4f 100644
--- a/app/assets/stylesheets/common/admin/api.scss
+++ b/app/assets/stylesheets/common/admin/api.scss
@@ -73,18 +73,28 @@ table.web-hooks.grid {
 
 table.api-keys {
   margin-bottom: 0.25em;
-  td.key {
-    font-size: $font-down-1;
+
+  .key-controls {
+    text-align: right;
   }
+
+  tr.revoked {
+    color: $primary-medium;
+  }
+
   @include breakpoint(tablet) {
     tr {
       grid-template-columns: 0.25fr 1fr 1fr;
     }
     td.key {
-      font-size: $font-0;
-      word-wrap: break-word;
       grid-row: 1;
       grid-column-start: 1;
+      grid-column-end: 1;
+      max-width: 100%;
+    }
+    td.key-description {
+      grid-row: 1;
+      grid-column-start: 2;
       grid-column-end: -1;
       max-width: 100%;
     }
@@ -138,6 +148,47 @@ table.api-keys {
   }
 }
 
+.admin-api-keys {
+  h2 {
+    margin-bottom: 10px;
+  }
+  .api-key {
+    padding: 10px;
+    margin-bottom: 10px;
+    border-bottom: 1px solid $primary-low;
+    .form-element,
+    .form-element-desc {
+      float: left;
+      padding: 0.5em 0;
+      &.input-area {
+        width: 75%;
+        .value-list,
+        .select-kit,
+        input[type="text"] {
+          width: 50%;
+          margin: 0;
+        }
+        .ac-wrap {
+          width: 50% !important;
+        }
+      }
+      &.label-area {
+        width: 25%;
+        label {
+          margin: 0.5em 1em 0 0;
+          text-align: right;
+          font-weight: bold;
+        }
+      }
+    }
+    .controls {
+      float: right;
+      text-align: left;
+      width: 50%;
+    }
+  }
+}
+
 // Webhook
 .web-hook-container {
   .tip.good:empty {
diff --git a/app/controllers/admin/api_controller.rb b/app/controllers/admin/api_controller.rb
index 1af4a40d0b..42ec4035eb 100644
--- a/app/controllers/admin/api_controller.rb
+++ b/app/controllers/admin/api_controller.rb
@@ -1,16 +1,67 @@
 # frozen_string_literal: true
 
 class Admin::ApiController < Admin::AdminController
+  # Note: in the REST API, ApiKeys are referred to simply as "key"
+  # If we used "api_key", then our user provider would try to use the value for authentication
 
   def index
-    render_serialized(ApiKey.where(hidden: false).to_a, ApiKeySerializer)
+    keys = ApiKey.where(hidden: false)
+
+    # Put active keys first
+    # Sort active keys by created_at, sort revoked keys by revoked_at
+    keys = keys.order(<<~SQL)
+      CASE WHEN revoked_at IS NULL THEN 0 ELSE 1 END,
+      COALESCE(revoked_at, created_at) DESC
+    SQL
+
+    render_serialized(keys.to_a, ApiKeySerializer, root: 'keys')
   end
 
-  def regenerate_key
+  def show
+    api_key = ApiKey.find_by!(id: params[:id])
+    render_serialized(api_key, ApiKeySerializer, root: 'key')
+  end
+
+  def update
+    api_key = ApiKey.find_by!(id: params[:id])
+    ApiKey.transaction do
+      api_key.update!(update_params)
+      log_api_key(api_key, UserHistory.actions[:api_key_update], changes: api_key.saved_changes)
+    end
+    render_serialized(api_key, ApiKeySerializer, root: 'key')
+  end
+
+  def destroy
+    api_key = ApiKey.find_by!(id: params[:id])
+    ApiKey.transaction do
+      api_key.destroy
+      log_api_key(api_key, UserHistory.actions[:api_key_destroy])
+    end
+    render json: success_json
+  end
+
+  def create
+    api_key = ApiKey.new(update_params)
+    ApiKey.transaction do
+      api_key.created_by = current_user
+      if username = params.require(:key).permit(:username)[:username].presence
+        api_key.user = User.find_by_username(username)
+        raise Discourse::NotFound unless api_key.user
+      end
+      api_key.save!
+      log_api_key(api_key, UserHistory.actions[:api_key_create], changes: api_key.saved_changes)
+    end
+    render_serialized(api_key, ApiKeySerializer, root: 'key')
+  end
+
+  def undo_revoke_key
     api_key = ApiKey.find_by(id: params[:id])
     raise Discourse::NotFound if api_key.blank?
 
-    api_key.regenerate!(current_user)
+    ApiKey.transaction do
+      api_key.update(revoked_at: nil)
+      log_api_key_restore(api_key)
+    end
     render_serialized(api_key, ApiKeySerializer)
   end
 
@@ -18,13 +69,32 @@ class Admin::ApiController < Admin::AdminController
     api_key = ApiKey.find_by(id: params[:id])
     raise Discourse::NotFound if api_key.blank?
 
-    api_key.destroy
-    render body: nil
-  end
-
-  def create_master_key
-    api_key = ApiKey.create_master_key
+    ApiKey.transaction do
+      api_key.update(revoked_at: Time.zone.now)
+      log_api_key_revoke(api_key)
+    end
     render_serialized(api_key, ApiKeySerializer)
   end
 
+  private
+
+  def update_params
+    editable_fields = [:description]
+    permitted_params = params.permit(key: [*editable_fields])[:key]
+    raise Discourse::InvalidParameters unless permitted_params
+    permitted_params
+  end
+
+  def log_api_key(*args)
+    StaffActionLogger.new(current_user).log_api_key(*args)
+  end
+
+  def log_api_key_revoke(*args)
+    StaffActionLogger.new(current_user).log_api_key_revoke(*args)
+  end
+
+  def log_api_key_restore(*args)
+    StaffActionLogger.new(current_user).log_api_key_restore(*args)
+  end
+
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 3261e8149a..bbfd7a0a54 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -19,8 +19,6 @@ class Admin::UsersController < Admin::AdminController
                                     :add_group,
                                     :remove_group,
                                     :primary_group,
-                                    :generate_api_key,
-                                    :revoke_api_key,
                                     :anonymize,
                                     :reset_bounce_score,
                                     :disable_second_factor,
@@ -102,7 +100,6 @@ class Admin::UsersController < Admin::AdminController
 
     User.transaction do
       @user.save!
-      @user.revoke_api_key
 
       user_history = StaffActionLogger.new(current_user).log_user_suspend(
         @user,
@@ -179,16 +176,6 @@ class Admin::UsersController < Admin::AdminController
     render body: nil
   end
 
-  def generate_api_key
-    api_key = @user.generate_api_key(current_user)
-    render_serialized(api_key, ApiKeySerializer)
-  end
-
-  def revoke_api_key
-    @user.revoke_api_key
-    render body: nil
-  end
-
   def grant_admin
     AdminConfirmation.new(@user, current_user).create_confirmation
     render json: success_json
diff --git a/app/jobs/scheduled/clean_up_unused_api_keys.rb b/app/jobs/scheduled/clean_up_unused_api_keys.rb
new file mode 100644
index 0000000000..4b9e756e63
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_unused_api_keys.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  class CleanUpUnusedApiKeys < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      ApiKey.revoke_unused_keys!
+    end
+
+  end
+
+end
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index 6062025519..198d746b30 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -4,23 +4,44 @@ class ApiKey < ActiveRecord::Base
   belongs_to :user
   belongs_to :created_by, class_name: 'User'
 
-  validates :user_id, uniqueness: true
+  scope :active, -> { where("revoked_at IS NULL") }
+  scope :revoked, -> { where("revoked_at IS NOT NULL") }
+
   validates_presence_of :key
 
-  def regenerate!(updated_by)
-    self.key = SecureRandom.hex(32)
-    self.created_by = updated_by
-    save!
+  after_initialize :generate_key
+
+  def generate_key
+    self.key ||= SecureRandom.hex(32)
   end
 
-  def self.create_master_key
-    api_key = ApiKey.find_by(user_id: nil, hidden: false)
-    if api_key.blank?
-      api_key = ApiKey.create(key: SecureRandom.hex(32), created_by: Discourse.system_user)
+  def truncated_key
+    self.key[0..3]
+  end
+
+  def self.last_used_epoch
+    SiteSetting.api_key_last_used_epoch.presence
+  end
+
+  def self.revoke_unused_keys!
+    return if SiteSetting.revoke_api_keys_days == 0 # Never expire keys
+    to_revoke = active.where("GREATEST(last_used_at, created_at, updated_at, :epoch) < :threshold",
+                  epoch: last_used_epoch,
+                  threshold: SiteSetting.revoke_api_keys_days.days.ago
+                )
+
+    to_revoke.find_each do |api_key|
+      ApiKey.transaction do
+        api_key.update!(revoked_at: Time.zone.now)
+
+        StaffActionLogger.new(Discourse.system_user).log_api_key(
+          api_key,
+          UserHistory.actions[:api_key_update],
+          changes: api_key.saved_changes,
+          context: I18n.t("staff_action_logs.api_key.automatic_revoked", count: SiteSetting.revoke_api_keys_days))
+      end
     end
-    api_key
   end
-
 end
 
 # == Schema Information
diff --git a/app/models/user.rb b/app/models/user.rb
index adaf9ee9bb..ccd5928853 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -84,7 +84,7 @@ class User < ActiveRecord::Base
   has_many :muted_user_records, class_name: 'MutedUser'
   has_many :muted_users, through: :muted_user_records
 
-  has_one :api_key, dependent: :destroy
+  has_many :api_keys, dependent: :destroy
 
   has_many :push_subscriptions, dependent: :destroy
 
@@ -1028,19 +1028,6 @@ class User < ActiveRecord::Base
     uploaded_avatar.present?
   end
 
-  def generate_api_key(created_by)
-    if api_key.present?
-      api_key.regenerate!(created_by)
-      api_key
-    else
-      ApiKey.create!(user: self, key: SecureRandom.hex(32), created_by: created_by)
-    end
-  end
-
-  def revoke_api_key
-    ApiKey.where(user_id: self.id).delete_all
-  end
-
   def find_email
     last_sent_email_address.present? && EmailValidator.email_regex =~ last_sent_email_address ? last_sent_email_address : email
   end
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 015d5bd15f..ec6fec4f11 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -97,7 +97,10 @@ class UserHistory < ActiveRecord::Base
       web_hook_deactivate: 76,
       change_theme_setting: 77,
       disable_theme_component: 78,
-      enable_theme_component: 79
+      enable_theme_component: 79,
+      api_key_create: 80,
+      api_key_update: 81,
+      api_key_destroy: 82,
     )
   end
 
@@ -171,7 +174,10 @@ class UserHistory < ActiveRecord::Base
       :embeddable_host_destroy,
       :change_theme_setting,
       :disable_theme_component,
-      :enable_theme_component
+      :enable_theme_component,
+      :api_key_create,
+      :api_key_update,
+      :api_key_destroy,
     ]
   end
 
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index abe0d13773..3555522497 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -29,10 +29,10 @@ class AdminDetailedUserSerializer < AdminUserSerializer
              :reset_bounce_score_after,
              :can_view_action_logs,
              :second_factor_enabled,
-             :can_disable_second_factor
+             :can_disable_second_factor,
+             :api_key_count
 
   has_one :approved_by, serializer: BasicUserSerializer, embed: :objects
-  has_one :api_key, serializer: ApiKeySerializer, embed: :objects
   has_one :suspended_by, serializer: BasicUserSerializer, embed: :objects
   has_one :silenced_by, serializer: BasicUserSerializer, embed: :objects
   has_one :tl3_requirements, serializer: TrustLevel3RequirementsSerializer, embed: :objects
@@ -118,4 +118,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer
     object.posts.count
   end
 
+  def api_key_count
+    object.api_keys.active.count
+  end
 end
diff --git a/app/serializers/api_key_serializer.rb b/app/serializers/api_key_serializer.rb
index 59f874be3e..c743b97d52 100644
--- a/app/serializers/api_key_serializer.rb
+++ b/app/serializers/api_key_serializer.rb
@@ -4,8 +4,11 @@ class ApiKeySerializer < ApplicationSerializer
 
   attributes :id,
              :key,
+             :description,
              :last_used_at,
-             :created_at
+             :created_at,
+             :updated_at,
+             :revoked_at
 
   has_one :user, serializer: BasicUserSerializer, embed: :objects
 
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index e564c6c790..f6264da3eb 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -663,6 +663,39 @@ class StaffActionLogger
     ))
   end
 
+  def log_api_key(api_key, action, opts = {})
+    opts[:changes]&.delete("key") # Do not log the full key
+
+    history_params = params(opts).merge(
+      action: action,
+      subject: api_key.truncated_key
+    )
+
+    if opts[:changes]
+      old_values, new_values = get_changes(opts[:changes])
+      history_params[:previous_value] = old_values&.join(", ") unless opts[:changes].keys.include?("id")
+      history_params[:new_value] = new_values&.join(", ")
+    end
+
+    UserHistory.create!(history_params)
+  end
+
+  def log_api_key_revoke(api_key)
+    UserHistory.create!(params.merge(
+      subject: api_key.truncated_key,
+      action: UserHistory.actions[:api_key_update],
+      details: I18n.t("staff_action_logs.api_key.revoked")
+    ))
+  end
+
+  def log_api_key_restore(api_key)
+    UserHistory.create!(params.merge(
+      subject: api_key.truncated_key,
+      action: UserHistory.actions[:api_key_update],
+      details: I18n.t("staff_action_logs.api_key.restored")
+    ))
+  end
+
   private
 
   def get_changes(changes)
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index fbc560dec0..99c7dc6dd4 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -66,7 +66,7 @@ class UserAnonymizer
       @user.user_associated_accounts.try(:destroy_all)
       @user.instagram_user_info.try(:destroy)
       @user.user_open_ids.find_each { |x| x.destroy }
-      @user.api_key.try(:destroy)
+      @user.api_keys.find_each { |x| x.try(:destroy) }
       @user.user_emails.secondary.destroy_all
 
       @user_history = log_action
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a431052d31..aeb0acdc58 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3315,18 +3315,30 @@ en:
         none: "There are no active API keys right now."
         user: "User"
         title: "API"
-        key: "API Key"
+        key: "Key"
         created: Created
+        updated: Updated
         last_used: Last Used
         never_used: (never)
         generate: "Generate"
-        regenerate: "Regenerate"
+        undo_revoke: "Undo Revoke"
         revoke: "Revoke"
-        confirm_regen: "Are you sure you want to replace that API Key with a new one?"
-        confirm_revoke: "Are you sure you want to revoke that key?"
-        info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "All Users"
-        note_html: "Keep this key <strong>secret</strong>, all users that have it may create arbitrary posts as any user."
+        active_keys: "Active API Keys"
+        manage_keys: Manage Keys
+        show_details: Details
+        description: Description
+        no_description: (no description)
+        all_api_keys: All API Keys
+        user_mode: User Level
+        impersonate_all_users: Impersonate any user
+        single_user: "Single User"
+        user_placeholder: Enter username
+        description_placeholder: What will this key be used for?
+        save: Save
+        new_key: New API Key
+        revoked: Revoked
+        delete: Permenantly Delete
 
       web_hooks:
         title: "Webhooks"
@@ -3918,6 +3930,9 @@ en:
             change_theme_setting: "change theme setting"
             disable_theme_component: "disable theme component"
             enable_theme_component: "enable theme component"
+            api_key_create: "api key create"
+            api_key_update: "api key update"
+            api_key_destroy: "api key destroy"
         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 b1619c47d4..fded4fd68d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2078,6 +2078,7 @@ en:
 
     retain_web_hook_events_period_days: "Number of days to retain web hook event records."
     retry_web_hook_events: "Automatically retry failed web hook events for 4 times. Time gaps between the retries are 1, 5, 25 and 125 minutes."
+    revoke_api_keys_days: "Number of days before an unused API key is automatically revoked (0 for never)"
 
     allow_user_api_keys: "Allow generation of user API keys"
     allow_user_api_key_scopes: "List of scopes allowed for user API keys"
@@ -4572,6 +4573,12 @@ en:
     user_merged: "%{username} was merged into this account"
     user_delete_self: "Deleted by self from %{url}"
     webhook_deactivation_reason: "Your webhook has been automatically deactivated. We received multiple '%{status}' HTTP status failure responses."
+    api_key:
+      automatic_revoked:
+        one: "Automatically revoked, last activity more than %{count} day ago"
+        other: "Automatically revoked, last activity more than %{count} days ago"
+      revoked: Revoked
+      restored: Restored
 
   reviewables:
     priorities:
diff --git a/config/routes.rb b/config/routes.rb
index 81cc8d095e..8fb57fab5e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,7 +111,6 @@ Discourse::Application.routes.draw do
       put "revoke_admin", constraints: AdminConstraint.new
       put "grant_admin", constraints: AdminConstraint.new
       post "generate_api_key", constraints: AdminConstraint.new
-      delete "revoke_api_key", constraints: AdminConstraint.new
       put "revoke_moderation", constraints: AdminConstraint.new
       put "grant_moderation", constraints: AdminConstraint.new
       put "approve"
@@ -257,10 +256,12 @@ Discourse::Application.routes.draw do
 
     resources :api, only: [:index], constraints: AdminConstraint.new do
       collection do
-        get "keys" => "api#index"
-        post "key" => "api#create_master_key"
-        put "key" => "api#regenerate_key"
-        delete "key" => "api#revoke_key"
+        resources :keys, controller: 'api', only: [:index, :show, :update, :create, :destroy] do
+          member do
+            post "revoke" => "api#revoke_key"
+            post "undo-revoke" => "api#undo_revoke_key"
+          end
+        end
 
         resources :web_hooks
         get 'web_hook_events/:id' => 'web_hooks#list_events', as: :web_hook_events
diff --git a/config/site_settings.yml b/config/site_settings.yml
index a70e811b79..63f1aecf1c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2056,6 +2056,11 @@ api:
     default: 30
   retry_web_hook_events:
     default: false
+  api_key_last_used_epoch: 
+    default: "" # Value is added in a migration
+    hidden: true
+  revoke_api_keys_days:
+    default: 180
 
 user_api:
   allow_user_api_keys:
diff --git a/db/migrate/20191101113230_add_revoked_at_to_api_key.rb b/db/migrate/20191101113230_add_revoked_at_to_api_key.rb
new file mode 100644
index 0000000000..c6453ab159
--- /dev/null
+++ b/db/migrate/20191101113230_add_revoked_at_to_api_key.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+class AddRevokedAtToApiKey < ActiveRecord::Migration[5.2]
+  def up
+    add_column :api_keys, :revoked_at, :datetime
+    add_column :api_keys, :description, :text
+
+    execute "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+             VALUES ('api_key_last_used_epoch', 1, now(), now(), now())"
+
+    remove_index :api_keys, :user_id # Remove unique index
+    add_index :api_keys, :user_id
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 24ed4122fe..d7ffdbeb3e 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -281,7 +281,7 @@ class Auth::DefaultCurrentUserProvider
   end
 
   def lookup_api_user(api_key_value, request)
-    if api_key = ApiKey.where(key: api_key_value).includes(:user).first
+    if api_key = ApiKey.active.where(key: api_key_value).includes(:user).first
       api_username = header_api_key? ? @env[HEADER_API_USERNAME] : request[API_USERNAME]
 
       if api_key.allowed_ips.present? && !api_key.allowed_ips.any? { |ip| ip.include?(request.ip) }
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 14715096a8..616de7b4c0 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -65,6 +65,24 @@ describe Auth::DefaultCurrentUserProvider do
       expect(key.last_used_at).to eq(nil)
     end
 
+    it "raises for a revoked key" do
+      user = Fabricate(:user)
+      key = ApiKey.create!(key: "hello")
+      expect(
+        provider("/?api_key=hello&api_username=#{user.username.downcase}").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)
+
+      expect {
+        provider("/?api_key=hello&api_username=#{user.username.downcase}").current_user
+      }.to raise_error(Discourse::InvalidAccess)
+
+      key.reload
+      expect(key.last_used_at).to eq(nil)
+    end
+
     it "raises for a user with a mismatching ip" do
       user = Fabricate(:user)
       ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1, allowed_ips: ['10.0.0.0/24'])
diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb
index fd6ac20303..aaaf719604 100644
--- a/spec/models/api_key_spec.rb
+++ b/spec/models/api_key_spec.rb
@@ -10,12 +10,59 @@ describe ApiKey do
   it { is_expected.to belong_to :created_by }
   it { is_expected.to validate_presence_of :key }
 
-  it 'validates uniqueness of user_id' do
-    Fabricate(:api_key, user: user)
-    api_key = Fabricate.build(:api_key, user: user)
+  it 'generates a key when saving' do
+    key = ApiKey.new
+    key.save!
+    initial_key = key.key
+    expect(initial_key.length).to eq(64)
 
-    expect(api_key.save).to eq(false)
-    expect(api_key.errors).to include(:user_id)
+    # Does not overwrite key when saving again
+    key.description = "My description here"
+    key.save!
+    expect(key.reload.key).to eq(initial_key)
+  end
+
+  it "can calculate the epoch correctly" do
+    expect(ApiKey.last_used_epoch.to_datetime).to be_a(DateTime)
+
+    SiteSetting.api_key_last_used_epoch = ""
+    expect(ApiKey.last_used_epoch).to eq(nil)
+  end
+
+  it "can automatically revoke keys" do
+    now = Time.now
+
+    SiteSetting.api_key_last_used_epoch = now - 2.years
+    SiteSetting.revoke_api_keys_days = 180 # 6 months
+
+    freeze_time now - 1.year
+    never_used = Fabricate(:api_key)
+    used_previously = Fabricate(:api_key)
+    used_previously.update(last_used_at: Time.zone.now)
+    used_recently = Fabricate(:api_key)
+
+    freeze_time now - 3.months
+    used_recently.update(last_used_at: Time.zone.now)
+
+    freeze_time now
+    ApiKey.revoke_unused_keys!
+
+    [never_used, used_previously, used_recently].each(&:reload)
+    expect(never_used.revoked_at).to_not eq(nil)
+    expect(used_previously.revoked_at).to_not eq(nil)
+    expect(used_recently.revoked_at).to eq(nil)
+
+    # Restore them
+    [never_used, used_previously, used_recently].each { |a| a.update(revoked_at: nil) }
+
+    # Move the epoch to 1 month ago
+    SiteSetting.api_key_last_used_epoch = now - 1.month
+    ApiKey.revoke_unused_keys!
+
+    [never_used, used_previously, used_recently].each(&:reload)
+    expect(never_used.revoked_at).to eq(nil)
+    expect(used_previously.revoked_at).to eq(nil)
+    expect(used_recently.revoked_at).to eq(nil)
   end
 
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 567f94f6df..73eb8d7cac 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1135,56 +1135,6 @@ describe User do
     end
   end
 
-  describe 'api keys' do
-    fab!(:admin) { Fabricate(:admin) }
-    fab!(:other_admin) { Fabricate(:admin) }
-    fab!(:user) { Fabricate(:user) }
-
-    describe '.generate_api_key' do
-
-      it "generates an api key when none exists, and regenerates when it does" do
-        expect(user.api_key).to be_blank
-
-        # Generate a key
-        api_key = user.generate_api_key(admin)
-        expect(api_key.user).to eq(user)
-        expect(api_key.key).to be_present
-        expect(api_key.created_by).to eq(admin)
-
-        user.reload
-        expect(user.api_key).to eq(api_key)
-
-        # Regenerate a key. Keeps the same record, updates the key
-        new_key = user.generate_api_key(other_admin)
-        expect(new_key.id).to eq(api_key.id)
-        expect(new_key.key).to_not eq(api_key.key)
-        expect(new_key.created_by).to eq(other_admin)
-      end
-
-    end
-
-    describe '.revoke_api_key' do
-
-      it "revokes an api key when exists" do
-        expect(user.api_key).to be_blank
-
-        # Revoke nothing does nothing
-        user.revoke_api_key
-        user.reload
-        expect(user.api_key).to be_blank
-
-        # When a key is present it is removed
-        user.generate_api_key(admin)
-        user.reload
-        user.revoke_api_key
-        user.reload
-        expect(user.api_key).to be_blank
-      end
-
-    end
-
-  end
-
   describe "posted too much in topic" do
     let!(:user) { Fabricate(:user, trust_level: TrustLevel[0]) }
     let!(:topic) { Fabricate(:post).topic }
diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb
index 4a20a47451..217ef19dc5 100644
--- a/spec/requests/admin/api_controller_spec.rb
+++ b/spec/requests/admin/api_controller_spec.rb
@@ -10,6 +10,9 @@ describe Admin::ApiController do
 
   fab!(:admin) { Fabricate(:admin) }
 
+  fab!(:key1) { Fabricate(:api_key, description: "my key") }
+  fab!(:key2) { Fabricate(:api_key, user: admin) }
+
   context "as an admin" do
     before do
       sign_in(admin)
@@ -19,60 +22,159 @@ describe Admin::ApiController do
       it "succeeds" do
         get "/admin/api/keys.json"
         expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)["keys"].length).to eq(2)
       end
     end
 
-    describe '#regenerate_key' do
-      fab!(:api_key) { Fabricate(:api_key) }
-
-      it "returns 404 when there is no key" do
-        put "/admin/api/key.json", params: { id: 1234 }
-        expect(response.status).to eq(404)
-      end
-
-      it "delegates to the api key's `regenerate!` method" do
-        prev_value = api_key.key
-        put "/admin/api/key.json", params: { id: api_key.id }
+    describe '#show' do
+      it "succeeds" do
+        get "/admin/api/keys/#{key1.id}.json"
         expect(response.status).to eq(200)
-
-        api_key.reload
-        expect(api_key.key).not_to eq(prev_value)
-        expect(api_key.created_by.id).to eq(admin.id)
+        data = JSON.parse(response.body)["key"]
+        expect(data["id"]).to eq(key1.id)
+        expect(data["key"]).to eq(key1.key)
+        expect(data["description"]).to eq("my key")
       end
     end
 
-    describe '#revoke_key' do
-      fab!(:api_key) { Fabricate(:api_key) }
+    describe '#update' do
+      it "allows updating the description" do
+        original_key = key1.key
 
-      it "returns 404 when there is no key" do
-        delete "/admin/api/key.json", params: { id: 1234 }
-        expect(response.status).to eq(404)
+        put "/admin/api/keys/#{key1.id}.json", params: {
+          key: {
+            description: "my new description",
+            key: "overridekey"
+          }
+        }
+        expect(response.status).to eq(200)
+
+        key1.reload
+        expect(key1.description).to eq("my new description")
+        expect(key1.key).to eq(original_key)
+
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:api_key_update])
+        expect(UserHistory.last.subject).to eq(key1.truncated_key)
       end
 
-      it "delegates to the api key's `regenerate!` method" do
-        delete "/admin/api/key.json", params: { id: api_key.id }
+      it "returns 400 for invalid payloads" do
+        put "/admin/api/keys/#{key1.id}.json", params: {
+          key: "string not a hash"
+        }
+        expect(response.status).to eq(400)
+
+        put "/admin/api/keys/#{key1.id}.json", params: {}
+        expect(response.status).to eq(400)
+      end
+    end
+
+    describe "#destroy" do
+      it "works" do
+        expect(ApiKey.exists?(key1.id)).to eq(true)
+
+        delete "/admin/api/keys/#{key1.id}.json"
+
         expect(response.status).to eq(200)
-        expect(ApiKey.where(key: api_key.key).count).to eq(0)
+        expect(ApiKey.exists?(key1.id)).to eq(false)
+
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:api_key_destroy])
+        expect(UserHistory.last.subject).to eq(key1.truncated_key)
+      end
+    end
+
+    describe "#create" do
+      it "can create a master key" do
+        post "/admin/api/keys.json", params: {
+          key: {
+            description: "master key description"
+          }
+        }
+        expect(response.status).to eq(200)
+
+        data = JSON.parse(response.body)
+
+        expect(data['key']['description']).to eq("master key description")
+        expect(data['key']['user']).to eq(nil)
+        expect(data['key']['key']).to_not eq(nil)
+        expect(data['key']['last_used_at']).to eq(nil)
+
+        key = ApiKey.find(data['key']['id'])
+        expect(key.description).to eq("master key description")
+        expect(key.user).to eq(nil)
+
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:api_key_create])
+        expect(UserHistory.last.subject).to eq(key.truncated_key)
+      end
+
+      it "can create a user-specific key" do
+        user = Fabricate(:user)
+        post "/admin/api/keys.json", params: {
+          key: {
+            description: "restricted key description",
+            username: user.username
+          }
+        }
+        expect(response.status).to eq(200)
+
+        data = JSON.parse(response.body)
+
+        expect(data['key']['description']).to eq("restricted key description")
+        expect(data['key']['user']['username']).to eq(user.username)
+        expect(data['key']['key']).to_not eq(nil)
+        expect(data['key']['last_used_at']).to eq(nil)
+
+        key = ApiKey.find(data['key']['id'])
+        expect(key.description).to eq("restricted key description")
+        expect(key.user.id).to eq(user.id)
+
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:api_key_create])
+        expect(UserHistory.last.subject).to eq(key.truncated_key)
+      end
+    end
+
+    describe "#revoke and #undo_revoke" do
+      it "works correctly" do
+        post "/admin/api/keys/#{key1.id}/revoke.json"
+        expect(response.status).to eq 200
+
+        key1.reload
+        expect(key1.revoked_at).to_not eq(nil)
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:api_key_update])
+        expect(UserHistory.last.subject).to eq(key1.truncated_key)
+        expect(UserHistory.last.details).to eq(I18n.t("staff_action_logs.api_key.revoked"))
+
+        post "/admin/api/keys/#{key1.id}/undo-revoke.json"
+        expect(response.status).to eq 200
+
+        key1.reload
+        expect(key1.revoked_at).to eq(nil)
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:api_key_update])
+        expect(UserHistory.last.subject).to eq(key1.truncated_key)
+        expect(UserHistory.last.details).to eq(I18n.t("staff_action_logs.api_key.restored"))
       end
     end
   end
 
-  describe '#create_master_key' do
-    it "creates a record" do
-      sign_in(admin)
-      expect do
-        post "/admin/api/key.json"
-      end.to change(ApiKey, :count).by(1)
-      expect(response.status).to eq(200)
-    end
-
-    it "doesn't allow moderators to create master keys" do
+  context "as a moderator" do
+    before do
       sign_in(Fabricate(:moderator))
-      expect do
-        post "/admin/api/key.json"
-      end.to change(ApiKey, :count).by(0)
-      expect(response.status).to eq(404)
     end
 
+    it "doesn't allow access" do
+      get "/admin/api/keys.json"
+      expect(response.status).to eq(404)
+
+      get "/admin/api/key/#{key1.id}.json"
+      expect(response.status).to eq(404)
+
+      post "/admin/api/keys.json", params: {
+        key: {
+          description: "master key description"
+        }
+      }
+      expect(response.status).to eq(404)
+
+      expect(ApiKey.count).to eq(2)
+    end
   end
 end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index e6bf9831d2..724b3a0ad4 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -123,25 +123,6 @@ RSpec.describe Admin::UsersController do
     end
   end
 
-  describe '#generate_api_key' do
-    it 'calls generate_api_key' do
-      post "/admin/users/#{user.id}/generate_api_key.json"
-      expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
-      expect(json["api_key"]["user"]["id"]).to eq(user.id)
-      expect(json["api_key"]["key"]).to be_present
-    end
-  end
-
-  describe '#revoke_api_key' do
-    it 'calls revoke_api_key' do
-      ApiKey.create!(user: user, key: SecureRandom.hex)
-      delete "/admin/users/#{user.id}/revoke_api_key.json"
-      expect(response.status).to eq(200)
-      expect(ApiKey.where(user: user).count).to eq(0)
-    end
-  end
-
   describe '#suspend' do
     fab!(:post) { Fabricate(:post) }
     let(:suspend_params) do
@@ -269,15 +250,26 @@ RSpec.describe Admin::UsersController do
       expect(log.details).to match(/long reason/)
     end
 
-    it "also revokes any api keys" do
-      Fabricate(:api_key, user: user)
-      put "/admin/users/#{user.id}/suspend.json", params: suspend_params
+    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",
+        api_key: api_key.key
+      }
       expect(response.status).to eq(200)
-      user.reload
 
+      put "/admin/users/#{user.id}/suspend.json", params: suspend_params
+      expect(response.status).to eq(200)
+
+      user.reload
       expect(user).to be_suspended
-      expect(ApiKey.where(user_id: user.id).count).to eq(0)
+
+      put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
+        bookmarked: "true",
+        api_key: api_key.key
+      }
+      expect(response.status).to eq(403)
     end
   end
 
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 5f6abb61f4..6969279502 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -42,7 +42,7 @@ describe EmbedController do
 
     context "with api key" do
 
-      let(:api_key) { ApiKey.create_master_key }
+      let(:api_key) { Fabricate(:api_key) }
 
       context "with valid embed url" do
         let(:topic_embed) { Fabricate(:topic_embed, embed_url: embed_url) }
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index a7e8c7d1a1..45e4327f3f 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -524,8 +524,8 @@ describe PostsController do
     end
 
     context "api" do
-      let(:api_key) { user.generate_api_key(user) }
-      let(:master_key) { ApiKey.create_master_key }
+      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
@@ -711,7 +711,7 @@ describe PostsController do
         raw = "this is a test post 123 #{SecureRandom.hash}"
         title = "this is a title #{SecureRandom.hash}"
 
-        master_key = ApiKey.create_master_key.key
+        master_key = Fabricate(:api_key).key
 
         post "/posts.json", params: {
           api_username: user.username,
@@ -740,7 +740,7 @@ describe PostsController do
         Jobs.run_immediately!
         NotificationEmailer.enable
         post_1 = Fabricate(:post)
-        master_key = ApiKey.create_master_key.key
+        master_key = Fabricate(:api_key).key
 
         post "/posts.json", params: {
           api_username: user.username,
@@ -796,7 +796,7 @@ describe PostsController do
 
       it 'will raise an error if specified category cannot be found' do
         user = Fabricate(:admin)
-        master_key = ApiKey.create_master_key.key
+        master_key = Fabricate(:api_key).key
 
         post "/posts.json", params: {
           api_username: user.username,
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 357ce90fbb..afbc542e3b 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1759,7 +1759,7 @@ RSpec.describe TopicsController do
       end
 
       context 'and the user is not logged in' do
-        let(:api_key) { topic.user.generate_api_key(topic.user) }
+        let(:api_key) { Fabricate(:api_key, user: topic.user) }
 
         it 'redirects to the login page' do
           get "/t/#{topic.slug}/#{topic.id}.json"
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index aa03d6f7d8..07613c8193 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -111,10 +111,10 @@ describe UserBadgesController do
     end
 
     it 'does not grant badges from regular api calls' do
-      Fabricate(:api_key, user: user)
+      api_key = Fabricate(:api_key, user: user)
 
       post "/user_badges.json", params: {
-        badge_id: badge.id, username: user.username, api_key: user.api_key.key
+        badge_id: badge.id, username: user.username, api_key: api_key.key
       }
 
       expect(response.status).to eq(403)
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 3f9deb0e69..d534d8ca16 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -218,7 +218,7 @@ describe UserAnonymizer do
       ApiKey.create(user_id: user.id, key: "123123123")
       expect { make_anonymous }.to change { ApiKey.count }.by(-1)
       user.reload
-      expect(user.api_key).to eq(nil)
+      expect(user.api_keys).to be_empty
     end
 
     context "executes job" do
diff --git a/test/javascripts/admin/models/admin-user-test.js.es6 b/test/javascripts/admin/models/admin-user-test.js.es6
deleted file mode 100644
index 729cd55d05..0000000000
--- a/test/javascripts/admin/models/admin-user-test.js.es6
+++ /dev/null
@@ -1,30 +0,0 @@
-import AdminUser from "admin/models/admin-user";
-import ApiKey from "admin/models/api-key";
-
-QUnit.module("model:admin-user");
-
-QUnit.test("generate key", function(assert) {
-  assert.expect(2);
-
-  var adminUser = AdminUser.create({ id: 333 });
-  assert.ok(!adminUser.get("api_key"), "it has no api key by default");
-  return adminUser.generateApiKey().then(function() {
-    assert.present(adminUser.get("api_key"), "it has an api_key now");
-  });
-});
-
-QUnit.test("revoke key", function(assert) {
-  assert.expect(2);
-
-  var apiKey = ApiKey.create({ id: 1234, key: "asdfasdf" }),
-    adminUser = AdminUser.create({ id: 333, api_key: apiKey });
-
-  assert.equal(
-    adminUser.get("api_key"),
-    apiKey,
-    "it has the api key in the beginning"
-  );
-  return adminUser.revokeApiKey().then(function() {
-    assert.blank(adminUser.get("api_key"), "it cleared the api_key");
-  });
-});
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index d05a79a491..74d93e38ff 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -611,8 +611,6 @@ export default function() {
       });
     });
 
-    this.post("/admin/users/:user_id/generate_api_key", success);
-    this.delete("/admin/users/:user_id/revoke_api_key", success);
     this.delete("/admin/users/:user_id.json", () =>
       response(200, { deleted: true })
     );

From 94a34af702442239ab986a59c14b7cdf40798cf5 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 5 Nov 2019 16:52:29 +0100
Subject: [PATCH 315/328] Update translations

---
 config/locales/client.ar.yml                  |   12 +-
 config/locales/client.be.yml                  |   11 +-
 config/locales/client.bg.yml                  |   62 +-
 config/locales/client.bs_BA.yml               |   16 +-
 config/locales/client.ca.yml                  |   45 +-
 config/locales/client.cs.yml                  |   14 +-
 config/locales/client.da.yml                  |   44 +-
 config/locales/client.de.yml                  |   24 +-
 config/locales/client.el.yml                  |   12 +-
 config/locales/client.en.yml                  |    2 +-
 config/locales/client.es.yml                  |  191 +-
 config/locales/client.et.yml                  |   14 +-
 config/locales/client.fa_IR.yml               |   21 +-
 config/locales/client.fi.yml                  |  182 +-
 config/locales/client.fr.yml                  |   64 +-
 config/locales/client.gl.yml                  |   12 +-
 config/locales/client.he.yml                  |   35 +-
 config/locales/client.hu.yml                  |   15 +-
 config/locales/client.hy.yml                  |   15 +-
 config/locales/client.id.yml                  |   10 +-
 config/locales/client.it.yml                  |   15 +-
 config/locales/client.ja.yml                  |   42 +-
 config/locales/client.ko.yml                  |   14 +-
 config/locales/client.lt.yml                  |   13 +-
 config/locales/client.lv.yml                  |   13 +-
 config/locales/client.nb_NO.yml               |   13 +-
 config/locales/client.nl.yml                  |   35 +-
 config/locales/client.pl_PL.yml               |  286 +-
 config/locales/client.pt.yml                  |   14 +-
 config/locales/client.pt_BR.yml               |   16 +-
 config/locales/client.ro.yml                  |   13 +-
 config/locales/client.ru.yml                  |   30 +-
 config/locales/client.sk.yml                  |   13 +-
 config/locales/client.sl.yml                  |   17 +-
 config/locales/client.sq.yml                  |   13 +-
 config/locales/client.sr.yml                  |   12 +-
 config/locales/client.sv.yml                  |   13 +-
 config/locales/client.sw.yml                  |   13 +-
 config/locales/client.te.yml                  |   12 +-
 config/locales/client.th.yml                  |   13 +-
 config/locales/client.tr_TR.yml               |   16 +-
 config/locales/client.uk.yml                  | 2275 +++++++++++++--
 config/locales/client.ur.yml                  |   20 +-
 config/locales/client.vi.yml                  |   22 +-
 config/locales/client.zh_CN.yml               |   32 +-
 config/locales/client.zh_TW.yml               |   15 +-
 config/locales/server.ar.yml                  |   10 +-
 config/locales/server.be.yml                  |   11 +-
 config/locales/server.bg.yml                  |    4 +-
 config/locales/server.bs_BA.yml               |    1 -
 config/locales/server.ca.yml                  |   68 +-
 config/locales/server.da.yml                  |    6 -
 config/locales/server.de.yml                  |   44 +-
 config/locales/server.el.yml                  |   47 -
 config/locales/server.es.yml                  |  240 +-
 config/locales/server.et.yml                  |    1 -
 config/locales/server.fa_IR.yml               |   29 +-
 config/locales/server.fi.yml                  |   63 +-
 config/locales/server.fr.yml                  |   58 +-
 config/locales/server.he.yml                  |  104 +-
 config/locales/server.hu.yml                  |    1 -
 config/locales/server.hy.yml                  |   37 -
 config/locales/server.it.yml                  |   39 +-
 config/locales/server.ja.yml                  |    2 +-
 config/locales/server.ko.yml                  |    4 +-
 config/locales/server.nb_NO.yml               |    2 -
 config/locales/server.nl.yml                  |   56 +-
 config/locales/server.pl_PL.yml               |  122 +-
 config/locales/server.pt.yml                  |   25 +-
 config/locales/server.pt_BR.yml               |   39 +-
 config/locales/server.ro.yml                  |   25 +-
 config/locales/server.ru.yml                  |    7 -
 config/locales/server.sk.yml                  |    2 +-
 config/locales/server.sl.yml                  |   35 +-
 config/locales/server.sq.yml                  |   27 +-
 config/locales/server.sr.yml                  |    2 +-
 config/locales/server.sv.yml                  |   15 +-
 config/locales/server.sw.yml                  |   37 +-
 config/locales/server.tr_TR.yml               |   22 +-
 config/locales/server.uk.yml                  | 2571 ++++++++++++++++-
 config/locales/server.ur.yml                  |   46 +-
 config/locales/server.vi.yml                  |   23 +-
 config/locales/server.zh_CN.yml               |  113 +-
 config/locales/server.zh_TW.yml               |   30 +-
 .../config/locales/client.uk.yml              |    3 +
 .../config/locales/server.da.yml              |    2 +-
 .../config/locales/server.en.yml              |    2 +-
 .../config/locales/server.nl.yml              |    2 +
 .../config/locales/server.uk.yml              |    6 +-
 .../config/locales/client.uk.yml              |   31 +-
 .../config/locales/server.uk.yml              |    7 +-
 .../config/locales/client.da.yml              |    4 +-
 .../config/locales/server.ar.yml              |    9 -
 .../config/locales/server.be.yml              |    4 -
 .../config/locales/server.bs_BA.yml           |   11 -
 .../config/locales/server.ca.yml              |    8 +-
 .../config/locales/server.da.yml              |    9 -
 .../config/locales/server.de.yml              |   15 -
 .../config/locales/server.el.yml              |   15 -
 .../config/locales/server.es.yml              |   16 +-
 .../config/locales/server.fa_IR.yml           |   15 -
 .../config/locales/server.fi.yml              |   15 -
 .../config/locales/server.fr.yml              |   15 -
 .../config/locales/server.he.yml              |    8 +-
 .../config/locales/server.hy.yml              |   15 -
 .../config/locales/server.id.yml              |    9 -
 .../config/locales/server.it.yml              |   15 -
 .../config/locales/server.ko.yml              |   15 -
 .../config/locales/server.nb_NO.yml           |   15 -
 .../config/locales/server.pl_PL.yml           |   14 +-
 .../config/locales/server.pt_BR.yml           |   15 -
 .../config/locales/server.ru.yml              |   15 -
 .../config/locales/server.sk.yml              |    9 -
 .../config/locales/server.sl.yml              |   33 +-
 .../config/locales/server.sw.yml              |   15 -
 .../config/locales/server.uk.yml              |  303 ++
 .../config/locales/server.ur.yml              |   15 -
 .../config/locales/server.vi.yml              |   27 +
 .../config/locales/server.zh_CN.yml           |    6 +-
 .../config/locales/server.uk.yml              |    4 +-
 .../config/locales/client.ja.yml              |    1 +
 .../config/locales/client.uk.yml              |   11 +-
 .../config/locales/server.en.yml              |    4 +-
 .../config/locales/server.uk.yml              |    5 +-
 plugins/poll/config/locales/client.uk.yml     |   57 +
 plugins/poll/config/locales/client.vi.yml     |    2 +
 plugins/poll/config/locales/server.fi.yml     |    2 +-
 plugins/poll/config/locales/server.uk.yml     |   29 +-
 public/403.ja.html                            |    4 +-
 public/500.da.html                            |    2 +-
 130 files changed, 6779 insertions(+), 1819 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index be1aa441a0..d67bb0eee5 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -768,7 +768,7 @@ ar:
         oauth_enabled_warning: "يرجى الملاحظة ان تسجيل الدخول عن طريق حسابات مواقع التواصل الاجتماعي سيتم تعطيلها بمجرد تفعيل خاصية التوثيق بعاملين الحساب"
         edit: "عدّل"
         security_key:
-          delete: 'أحذف'
+          delete: "أحذف"
       change_about:
         title: "تعديل عني"
         error: "حدث عطل أثناء تغيير هذه القيمة."
@@ -792,9 +792,6 @@ ar:
         uploaded_avatar_empty: "اضافة صورة مخصصة"
         upload_title: "ارفع صورتك "
         image_is_not_a_square: "تحذير: لقد قصصنا صورتك، لأن عرضها وارتفاعها غير متساويان."
-      change_profile_background:
-        title: "خلفية الملف الشخصي"
-        instructions: "سيتم وضع خلفية الملف الشخصي في المنتصف بعرض افتراضي يصل الى 850px"
       change_card_background:
         title: "خلفية بطاقة العضو"
         instructions: "سيتم وضع صورة الخلفية في المنتصف بعرض 590px"
@@ -1014,6 +1011,8 @@ ar:
         header_title: "الملف الشخصي و الرسائل و العلامات المرجعية و التفضيلات"
       title:
         title: "عنوان"
+      primary_group:
+        title: "المجموعة الأساسية"
       filters:
         all: "الكل"
       stream:
@@ -1906,6 +1905,8 @@ ar:
         image_upload_not_allowed_for_new_user: "عذرا، لا يمكن للأعضاء الجدد رفع الصور."
         attachment_upload_not_allowed_for_new_user: "عذرا، لا يمكن للأعضاء الجدد رفع المرفقات."
         attachment_download_requires_login: "عذرا، عليك تسجيل الدخول لتحميل المرفقات."
+      abandon_edit:
+        no_value: "لا, إبقاء"
       abandon:
         confirm: "أمتأكد من التخلي عن المنشور؟"
         no_value: "لا، أبقه"
@@ -2613,7 +2614,6 @@ ar:
               staff: "مالكي المجموعة و طاقم العمل"
           membership:
             automatic: تلقائي
-            trust_level: مستوى الثقة
             trust_levels_title: "مستوى الثقة الذي يُعطى للأعضاء آليا عندما يضافون:"
             trust_levels_none: "لا شيء"
             automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة."
@@ -3378,6 +3378,8 @@ ar:
           search: "البحث"
           groups: "المجموعات"
           dashboard: "لوحة التحكم"
+        default_categories:
+          modal_yes: "نعم"
       badges:
         title: الشارات
         new_badge: شارة جديدة
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 8e858e2f1b..505e4c549a 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -443,7 +443,7 @@ be:
         edit: "рэдагаваць"
         security_key:
           register: "рэгістрацыя"
-          delete: 'выдаліць'
+          delete: "выдаліць"
       change_about:
         title: "Змяніць інфу аба мяне"
       change_username:
@@ -462,9 +462,6 @@ be:
         uploaded_avatar: "Іншая выява"
         uploaded_avatar_empty: "Дадаць малюнак"
         upload_title: "Загрузіць свой малюнак"
-      change_profile_background:
-        title: "фон профілю"
-        instructions: "Фон профілю будзе адцэнтраваны, яго шырыня 850 кропак (па змаўчанні)."
       change_card_background:
         title: "Фон вашай візітоўкі"
       email:
@@ -960,6 +957,8 @@ be:
     post:
       errors:
         upload: "Выбачайце, пры загрузцы гэтага файла адбылася памылка. Калі ласка, паспрабуйце яшчэ раз."
+      abandon_edit:
+        no_value: "Не, пачакайце"
       abandon:
         no_value: "Не, пачакайце"
         yes_value: "Так, пакінуць"
@@ -1249,8 +1248,6 @@ be:
             email: электронная пошта
             visibility_levels:
               public: "Усе"
-          membership:
-            trust_level: узровень даверу
         title: "групы"
         edit: "мяняць групы"
         refresh: "абнавіць"
@@ -1704,6 +1701,8 @@ be:
           search: "пошук"
           groups: "групы"
           dashboard: "майстэрня"
+        default_categories:
+          modal_yes: "ды"
       badges:
         title: значкі
         new_badge: новы значок
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 71f4db1355..dbb35f2d83 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -48,6 +48,9 @@ bg:
         x_seconds:
           one: "%{count}сек"
           other: "%{count}сек"
+        less_than_x_minutes:
+          one: "< %{count}м"
+          other: "< %{count}м"
         x_minutes:
           one: "%{count}мин"
           other: "%{count}мин"
@@ -57,6 +60,9 @@ bg:
         x_days:
           one: "%{count}д"
           other: "%{count}д"
+        x_months:
+          one: "%{count}месец"
+          other: "%{count}месеца"
         about_x_years:
           one: "%{count}г"
           other: "%{count}г"
@@ -89,6 +95,12 @@ bg:
         x_days:
           one: "преди %{count} ден"
           other: "преди %{count} дни"
+        x_months:
+          one: "преди %{count} месец"
+          other: "преди %{count} месеца"
+        x_years:
+          one: "преди %{count} година"
+          other: "преди %{count} години "
       later:
         x_days:
           one: "%{count} ден по-късно"
@@ -103,8 +115,12 @@ bg:
       next_month: "Следващ месец"
       placeholder: дата
     share:
+      topic_html: 'Тема: <span class="topic-title">%{topicTitle}</span>'
       post: "публикации #%{postNumber}"
       close: "затвори"
+      twitter: "Споделете тази връзка в Twitter"
+      facebook: "Споделете тази връзка във Facebook"
+      email: "Изпратете тази връзка с имейл"
     action_codes:
       public_topic: "направи тази тема публична на %{when}"
       private_topic: "направи тази тема персонално съобщение%{when}"
@@ -137,6 +153,7 @@ bg:
     bootstrap_mode_enabled: "За да помогнем със стартирането на вашия нов сайт по-лесно поставихме сайта в \"стартиращо режим\". Всички нови потребители ще получат ниво на доверие 1 и ще имат активирани дневни известия за активноста във форума. Този режим ще бъде автоматично спрян когато бройката регистрирани потребители стигне %{min_users} ."
     themes:
       default_description: "По подразбиране"
+      broken_theme_alert: "Вашият уебсайт може да не работи, защото в тема / компонент %{theme} има грешки. Изключете я тук %{path}."
     s3:
       regions:
         ap_northeast_1: "Азия (Токио)"
@@ -144,10 +161,19 @@ bg:
         ap_south_1: "Азия (Мумбай)"
         ap_southeast_1: "Азия (Сингапур)"
         ap_southeast_2: "Океания (Сидни)"
+        ca_central_1: "Canada (Central)"
         cn_north_1: "Китай (Пекин)"
+        cn_northwest_1: "China (Ningxia)"
         eu_central_1: "EU (Франкфурт)"
+        eu_north_1: "EU (Stockholm)"
         eu_west_1: "EU (Ирландия)"
+        eu_west_2: "EU (London)"
+        eu_west_3: "EU (Paris)"
+        sa_east_1: "South America (São Paulo)"
         us_east_1: "US East (Из. Вирджиния)"
+        us_east_2: "US East (Ohio)"
+        us_gov_east_1: "AWS GovCloud (US-East)"
+        us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "US West (С. Калифорния)"
         us_west_2: "US West (Орегон)"
     edit: "редактирайте заглавието и категорията на тази тема"
@@ -158,6 +184,7 @@ bg:
     submit: "Изпрати"
     generic_error: "Съжаляваме, възникна грешка."
     generic_error_with_reason: "Грешка: %{error}"
+    go_ahead: "Продължете напред"
     sign_up: "Регистрация"
     log_in: "Вход"
     age: "Години"
@@ -174,6 +201,8 @@ bg:
     privacy_policy: "Декларация за поверителност"
     privacy: "Поверителност"
     tos: "Правила за ползване"
+    rules: "Правила"
+    conduct: "Правила за поведение"
     mobile_view: "Мобилен изглед"
     desktop_view: "Десктоп изглед"
     you: "Вие"
@@ -187,11 +216,15 @@ bg:
     every_hour: "на всеки час"
     daily: "ежедневно"
     weekly: "седмично"
+    every_month: "всеки месец"
+    every_six_months: "на всеки шест месеца"
     max_of_count: "максимално от {{count}}"
     alternation: "или"
     character_count:
       one: "{{count}} символ"
       other: "{{count}} символа"
+    related_messages:
+      title: "Свързани съобщения"
     suggested_topics:
       title: "Подобни теми"
       pm_title: "Предложени съобщения"
@@ -204,6 +237,8 @@ bg:
       moderators: "Модератори"
       stat:
         all_time: "От началото"
+        last_7_days: "Последните 7"
+        last_30_days: "Последните 30"
       like_count: "Харесвания"
       topic_count: "Теми"
       post_count: "Публикации"
@@ -219,12 +254,16 @@ bg:
         unbookmark: "Щракнете тук за да изтриите всички отметки в тази тема"
     bookmarks:
       created: "Вие добавихте тази публикация в отметки"
+      not_bookmarked: "добавете тази публикация в Отметки"
       remove: "Премахнете отметката"
     drafts:
       remove: "Премахване"
       abandon:
         yes_value: "Да, напусни"
         no_value: "Не, запази"
+    topic_count_new:
+      one: "Вижте {{count}} нова тема"
+      other: "Вижте {{count}} нови теми"
     preview: "преглед"
     cancel: "прекрати"
     save: "Запазете промените"
@@ -232,7 +271,9 @@ bg:
     saved: "Запазено!"
     upload: "Качване"
     uploading: "Качва се..."
+    uploading_filename: "Качване: {{filename}}..."
     uploaded: "Качено!"
+    pasting: "Вмъкване..."
     enable: "Позволи"
     disable: "Деактивиране"
     continue: "Напред"
@@ -249,6 +290,7 @@ bg:
       title:
         placeholder: "Въведете заглавието на темата тук"
     review:
+      order_by: "Подреди по"
       explain:
         total: "Общо"
       delete: "Изтрий"
@@ -617,7 +659,7 @@ bg:
         edit: "Редактирай"
         security_key:
           register: "Регистриране"
-          delete: 'Изтрий'
+          delete: "Изтрий"
       change_about:
         title: "Смяна на За мен"
         error: "Имаше грешка при промяна на тази стойност."
@@ -641,9 +683,6 @@ bg:
         uploaded_avatar_empty: "Добавете собствено изображение"
         upload_title: "Качете изображение"
         image_is_not_a_square: "Внимание: изрязахмеИзрязахме вашата снимка,снимка защото не е с квадратна форма."
-      change_profile_background:
-        title: "Фон на профила"
-        instructions: "Фонът на профила ще бъде центриран и ще има ширина по подразбиране 850 пиксела."
       change_card_background:
         title: "Потребителски фон"
         instructions: "Фонът ще бъде центриран и ще има дължина 590 пиксела."
@@ -712,6 +751,8 @@ bg:
         every_hour: "почасово"
         daily: "дневно"
         weekly: "седмично"
+        every_month: "всеки месец"
+        every_six_months: "на всеки шест месеца"
       email_level:
         title: "Изпращайте ми имейл, когато някой ме цитира, отговаря на моите публикации, цитира моето @потребителско_име или ме кани да се присъединя към тема."
         always: "винаги"
@@ -826,6 +867,9 @@ bg:
       title:
         title: "Заглавие"
         none: "(никой)"
+      primary_group:
+        title: "Главна група"
+        none: "(никой)"
       filters:
         all: "Всички"
       stream:
@@ -1490,6 +1534,8 @@ bg:
         image_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да качват снимки."
         attachment_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да прикачват файлове."
         attachment_download_requires_login: "Съжаляваме, трябва да сте логнат, за да може да сваляте прикачените файлове."
+      abandon_edit:
+        no_value: "Не, запази"
       abandon:
         confirm: "Сигурни ли сте, че искате да напуснете тази публикация?"
         no_value: "Не, запази"
@@ -1996,6 +2042,8 @@ bg:
         reports:
           today: "Днес"
           yesterday: "Вчера"
+          last_7_days: "Последните 7"
+          last_30_days: "Последните 30"
           all_time: "От началото"
           7_days_ago: "Преди 7 дни"
           30_days_ago: "Преди 30 дни"
@@ -2025,7 +2073,6 @@ bg:
               public: "Всички"
           membership:
             automatic: Автоматично
-            trust_level: Ниво на Доверие
             trust_levels_title: "Нивото на доверие, което се предоставя автоматично на членовете, когато бъдат добавени:"
             trust_levels_none: "Без"
             automatic_membership_email_domains: "Потребители, които са регистрирани с имейл домейн, който съвпада с друг от този списък, автоматично ще бъдат добавени към тази група:"
@@ -2658,6 +2705,8 @@ bg:
           search: "Търсене"
           groups: "Групи"
           dashboard: "Работен плот"
+        default_categories:
+          modal_yes: "Да"
       badges:
         title: Значки
         new_badge: Нова значка
@@ -2725,6 +2774,9 @@ bg:
             with_post: "<span class=\"username\">%{username}</span> за публикации в %{link} "
             with_post_time: "<span class=\"username\">%{username}</span> за публикация %{link} в <span class=\"time\">%{time}</span> "
             with_time: "<span class=\"username\">%{username}</span> в <span class=\"time\">%{time}</span> "
+        badge_intro:
+          title: "Изберете съществуваща значка или създайте нова, за да започнете"
+          what_are_badges_title: "Какво са значките?"
       emoji:
         title: "Емотикони "
         help: "Добави нови емотикони, които ще бъдат достъпни до всички. (Съвет: Може да дръпнете и пуснете много файлове наведнъж). "
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 9702ac9417..27bee3090d 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -929,7 +929,7 @@ bs_BA:
           add: "Novi Authenticator"
           default_name: "Moj Authenticator"
         security_key:
-          delete: 'Izbriši'
+          delete: "Izbriši"
       change_about:
         title: "Promjeni O meni"
         error: "Desila se greška prilikom promjene."
@@ -955,9 +955,6 @@ bs_BA:
         uploaded_avatar_empty: "Dodajte vašu sliku"
         upload_title: "Učitajte vašu sliku sa uređaja"
         image_is_not_a_square: "Upozorenje: morali smo izrezat vašu sliku; nije bila kvadratnog oblika."
-      change_profile_background:
-        title: "Pozadina profila"
-        instructions: "Pozadinske slike profila će biti centrirane i imati širinu od 850px."
       change_card_background:
         title: "Pozadina Korisničke kartice"
         instructions: "Pozadinske slike će biti centrirane i imati standard širinu od 590 pixela."
@@ -1208,6 +1205,9 @@ bs_BA:
       title:
         title: "Naslov"
         none: "(ništa)"
+      primary_group:
+        title: "Primary Group"
+        none: "(ništa)"
       filters:
         all: "Sve"
       stream:
@@ -1535,7 +1535,6 @@ bs_BA:
       link_description: "ubaci opis linka"
       link_dialog_title: "Unesi Link"
       link_optional_text: "naslov neobavezan"
-      link_url_placeholder: "https://example.com"
       quote_title: "Blok Citat"
       quote_text: "Citat u bloku"
       code_title: "Formatiran Tekst"
@@ -2253,6 +2252,9 @@ bs_BA:
         image_upload_not_allowed_for_new_user: "Sorry, new users can not upload images."
         attachment_upload_not_allowed_for_new_user: "Sorry, new users can not upload attachments."
         attachment_download_requires_login: "Sorry, you need to be logged in to download attachments."
+      abandon_edit:
+        no_value: "Ne, sačuvaj"
+        no_save_draft: "Ne,spasi skicu"
       abandon:
         confirm: "Da li ste sigurni da želite otkazati vaš post?"
         no_value: "Ne, sačuvaj"
@@ -2399,7 +2401,6 @@ bs_BA:
       tags_allowed_tags: "Ograničite ove oznake na ovu kategoriju:"
       tags_allowed_tag_groups: "Ograničite ove grupe oznaka na ovu kategoriju:"
       tags_placeholder: "(Opcionalno) lista dozvoljenih oznaka"
-      tags_tab_description: "Oznake i grupe oznaka koje su ovdje navedene bit će dostupne samo u ovoj kategoriji i drugim kategorijama koje ih također navode. Oni neće biti dostupni za upotrebu u drugim kategorijama."
       tag_groups_placeholder: "(Opcionalno) lista dozvoljenih grupa oznaka"
       manage_tag_groups_link: "Upravljajte grupama oznaka ovdje."
       allow_global_tags_label: "Takođe dozvolite druge oznake"
@@ -3025,7 +3026,6 @@ bs_BA:
               public: "Svatko"
           membership:
             automatic: Automatsko
-            trust_level: Nivo povjerenja
             trust_levels_title: "Razina povjerenja je automatski dodijeljena članovima kada su postavljeni: "
             trust_levels_none: "Ništa"
         name_placeholder: "Ime grupe, bez razmaka, ista pravila kao za korisničko ime"
@@ -4013,6 +4013,8 @@ bs_BA:
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Polja za unos ne mogu biti prazna ili sadrže znak vertikalne trake."
+        default_categories:
+          modal_yes: "Da"
       badges:
         title: Bedž
         new_badge: Novi Bedž
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index ba47b17bf6..411bc22d88 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -880,6 +880,7 @@ ca:
         copied_to_clipboard: "Copiat al porta-retalls."
         copy_to_clipboard_error: "Error copiant dades al porta-retalls"
         remaining_codes: "Us resten <strong>{{count}}</strong> codis de còpia de seguretat."
+        use: "Utilitza un codi de còpia de seguretat"
         enable_prerequisites: "Cal habilitar un segon factor primari abans de generar codis de còpia de seguretat."
         codes:
           title: "Codis de còpia de seguretat generats"
@@ -887,6 +888,7 @@ ca:
       second_factor:
         title: "Autenticació de dos factors"
         enable: "Gestiona l'autenticació de dos factors"
+        forgot_password: "Heu oblidat la contrasenya?"
         confirm_password_description: "Confirmeu la contrasenya per a continuar"
         name: "Nom"
         label: "Codi"
@@ -900,6 +902,7 @@ ca:
         extended_description: |
           L'autenticació de dos factors afegeix seguretat addicional al vostre compte exigint un testimoni únic a més de la vostra contrasenya. Es poden generar testimonis en dispositius <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> i <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>.
         oauth_enabled_warning: "Observeu que els inicis de sessió amb xarxes socials seran deshabilitats quan l'autenticació de dos factors s'hagi activat en el vostre compte. "
+        use: "Utilitza l'aplicació Authenticator"
         enforced_notice: "Cal que activeu l'autenticació de dos factors abans d'accedir a aquest lloc web."
         disable: "deshabilita"
         disable_title: "Deshabilita el segon factor"
@@ -907,13 +910,21 @@ ca:
         edit: "Edita"
         edit_title: "Edita el factor segon"
         edit_description: "Nom del factor segon"
+        enable_security_key_description: "Quan tingueu preparada la vostra clau de seguretat física, premeu el botó Registre."
         totp:
           title: "Autenticadors basats en testimonis"
           add: "Autenticador nou"
           default_name: "El meu autenticador"
         security_key:
           register: "Registre"
-          delete: 'Suprimeix'
+          title: "Claus de seguretat"
+          add: "Registra la clau de seguretat"
+          default_name: "Clau de seguretat principal"
+          not_allowed_error: "El procés de registre de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
+          already_added_error: "Ja heu registrat aquesta clau de seguretat. No cal que la registreu de nou."
+          edit: "Edita la clau de seguretat"
+          edit_description: "Nom de la clau de seguretat"
+          delete: "Suprimeix"
       change_about:
         title: "Canvia Quant a mi"
         error: "Hi ha hagut un error en canviar aquest valor"
@@ -939,9 +950,6 @@ ca:
         uploaded_avatar_empty: "Afegeix una foto personalitzada"
         upload_title: "Carrega la foto"
         image_is_not_a_square: "Atenció: hem retallat la vostra imatge; l'amplada i l'alçada no eren iguals."
-      change_profile_background:
-        title: "Fons del perfil"
-        instructions: "Els fons de perfil se centraran i tindran una amplada per defecte de 850px."
       change_card_background:
         title: "Fons de la targeta d'usuari"
         instructions: "Les imatges de fons se centraran i tindran una amplada per defecte de 590px."
@@ -1183,6 +1191,9 @@ ca:
       title:
         title: "Títol"
         none: "(cap)"
+      primary_group:
+        title: "Grup primari"
+        none: "(cap)"
       filters:
         all: "Tot"
       stream:
@@ -1316,8 +1327,16 @@ ca:
       password: "Contrasenya"
       second_factor_title: "Autenticació de dos factors"
       second_factor_description: "Introduïu el codi d'autenticació de la vostra aplicació:"
+      second_factor_backup: "Inici de sessió amb codi de còpia de seguretat "
       second_factor_backup_title: "Còpia de seguretat de dos factors"
       second_factor_backup_description: "Introduïu un dels vostres codis de còpia de seguretat:"
+      second_factor: "Inici de sessió amb l’aplicació Authenticator"
+      security_key_description: "Quan tingueu preparada la vostra clau de seguretat física, premeu el botó Autentica amb clau de seguretat."
+      security_key_alternative: "¿No podeu trobar la vostra clau de seguretat o voleu utilitzar un altre mètode?"
+      security_key_authenticate: "Autenticació amb clau de seguretat"
+      security_key_not_allowed_error: "El procés d'autenticació de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
+      security_key_no_matching_credential_error: "No s'ha trobat cap credencial coincident amb la clau de seguretat proporcionada."
+      security_key_support_missing_error: "El vostre dispositiu o navegador actual no admet l'ús de claus de seguretat. Utilitzeu un mètode diferent."
       email_placeholder: "correu electrònic o nom d'usuari"
       caps_lock_warning: "El bloqueig de majúscula és activat"
       error: "Error desconegut"
@@ -1385,6 +1404,7 @@ ca:
       apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (abans EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1520,7 +1540,7 @@ ca:
       link_description: "introduïu una descripció de l'enllaç"
       link_dialog_title: "Insereix un enllaç"
       link_optional_text: "títol opcional"
-      link_url_placeholder: "https://example.com"
+      link_url_placeholder: "Enganxeu un URL o escriviu per a cercar temes"
       quote_title: "Bloc de citació"
       quote_text: "Bloc de citació"
       code_title: "Text preformatat"
@@ -2211,6 +2231,11 @@ ca:
         image_upload_not_allowed_for_new_user: "Els usuaris nous no poden pujar imatges."
         attachment_upload_not_allowed_for_new_user: "Els usuaris nous no poden adjuntar fitxers."
         attachment_download_requires_login: "Heu d'iniciar la sessió per a descarregar fitxers adjunts."
+      abandon_edit:
+        confirm: "Esteu segur que voleu descartar els canvis?"
+        no_value: "No, segueix"
+        no_save_draft: "No, desa l'esborrany"
+        yes_value: "Sí, descarta l'edició"
       abandon:
         confirm: "Esteu segur que voleu abandonar la vostra publicació?"
         no_value: "No, segueix"
@@ -2353,7 +2378,6 @@ ca:
       tags_allowed_tags: "Restringeix aquestes etiquetes per a aquesta categoria:"
       tags_allowed_tag_groups: "Restringeix aquests grups d'etiquetes a aquesta categoria:"
       tags_placeholder: "Llista (opcional) d'etiquetes permeses"
-      tags_tab_description: "Les etiquetes i els grups d'etiquetes especificats aquí només estaran disponibles en aquesta categoria i en altres categories que també els especifiquin. No estaran disponibles per a altres categories."
       tag_groups_placeholder: "Llista (opcional) d'etiquetes de grup permeses"
       manage_tag_groups_link: "Gestioneu els grups d'etiquetes aquí."
       allow_global_tags_label: "Permet també altres etiquetes"
@@ -2990,8 +3014,8 @@ ca:
             publish_read_state: "En els missatges de grup publica l'estat de lectura del grup"
           membership:
             automatic: Automàtic
-            trust_level: Nivell de confiança
             trust_levels_title: "Nivell de confiança atorgat automàticament a membres quan són afegits:"
+            effects: Efectes
             trust_levels_none: "Cap"
             automatic_membership_email_domains: "Els usuaris registrats amb un domini de correu que coincideix amb un de la llista s'afegiran automàticament a aquest grup:"
             automatic_membership_retroactive: "Aplica la mateixa regla de domini de correu per a afegir usuaris registrats existents."
@@ -3024,6 +3048,8 @@ ca:
         title: "API"
         key: "Clau API"
         created: Creat
+        last_used: Darrer utilitzat
+        never_used: (mai)
         generate: "Genera"
         regenerate: "Regenera"
         revoke: "Revoca"
@@ -3346,6 +3372,7 @@ ca:
             other: "L'aparença és {{count}} commits darrere!"
           compare_commits: "(Vegeu els commits nous)"
           repo_unreachable: "No s'ha pogut contactar amb el repositori git d'aquesta aparença. Missatge d'error:"
+          imported_from_archive: "Aquesta aparença s'ha importat d'un fitxer .zip"
           scss:
             text: "CSS"
             title: "Introduïu el CSS personalitzat. Acceptem tots els estils CSS i SCSS vàlids."
@@ -4002,6 +4029,10 @@ ca:
           dashboard: "Tauler de control"
         secret_list:
           invalid_input: "Els camps d'entrada no poden ser buits o contenir un caràcter de barra vertical."
+        default_categories:
+          modal_description: "Voleu aplicar històricament aquest canvi? Això canviarà les preferències per a %{count} usuaris existents."
+          modal_yes: "Sí"
+          modal_no: "No, aplica el canvi només en el futur"
       badges:
         title: Insígnies
         new_badge: Insígnia nova
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index ab9663adbf..94466288b1 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -775,7 +775,7 @@ cs:
         oauth_enabled_warning: "Upozorňujeme, že možnost přihlásit se pomocí účtu ze sociální sítě bude vypnuta, jakmila bude na vašem účtu povolena dvoufaktorová autentizace."
         edit: "Upravit"
         security_key:
-          delete: 'Smazat'
+          delete: "Smazat"
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -801,9 +801,6 @@ cs:
         uploaded_avatar_empty: "Přidat vlastní obrázek"
         upload_title: "Nahrát obrázek"
         image_is_not_a_square: "Varování: Ořízli jsme váš obrázek; šířka a délka nebyla stejná."
-      change_profile_background:
-        title: "Pozadí profilu"
-        instructions: "Pozadí profilu je zarovnáno doprostřed a má výchozí šířku 850px."
       change_card_background:
         title: "Pozadí uživatelské karty"
         instructions: "Obrázky pozadí jsou zarovnány a mají výchozí šířku 590px. "
@@ -1040,6 +1037,9 @@ cs:
       title:
         title: "Titul"
         none: "(žádný)"
+      primary_group:
+        title: "Hlavní skupina"
+        none: "(žádný)"
       filters:
         all: "Všechno"
       stream:
@@ -1350,7 +1350,6 @@ cs:
       link_description: "sem vložte popis odkazu"
       link_dialog_title: "Vložit odkaz"
       link_optional_text: "volitelný popis"
-      link_url_placeholder: "https://example.com"
       quote_title: "Bloková citace"
       quote_text: "Bloková citace"
       code_title: "Ukázka kódu"
@@ -2018,6 +2017,8 @@ cs:
         image_upload_not_allowed_for_new_user: "Bohužel, noví uživatelé nemohou nahrávat obrázky."
         attachment_upload_not_allowed_for_new_user: "Bohužel, noví uživatelé nemohou nahrávat přílohy."
         attachment_download_requires_login: "Omlouváme se, ale pro stáhnutí přílohy musíte být přihlášen."
+      abandon_edit:
+        no_value: "Nezahazovat"
       abandon:
         confirm: "Opravdu chcete svůj příspěvek zahodit?"
         no_value: "Nezahazovat"
@@ -2751,7 +2752,6 @@ cs:
               staff: "Vlastníci a redaktoři skupiny"
           membership:
             automatic: Automatické
-            trust_level: Věrohodnost
             trust_levels_title: "Automaticky přidělená věrohodnost členům když jsou přidáni: "
             trust_levels_none: "Žádná"
             automatic_membership_email_domains: "Uživatelé zaregistrovaní s emailem jehož doména se přesně shoduje s jednou z tohoto seznamu budou automaticky přidáni to této skupiny:"
@@ -3600,6 +3600,8 @@ cs:
           search: "Vyhledávání"
           groups: "Skupiny"
           dashboard: "Rozcestník"
+        default_categories:
+          modal_yes: "Ano"
       badges:
         title: Odznaky
         new_badge: Nový odznak
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 46c040f77a..e80b35d6ce 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -319,9 +319,25 @@ da:
       order_by: "Filtrér efter"
       in_reply_to: "som svar til"
       explain:
+        why: "forklar hvorfor dette punkt endte i køen"
+        title: "Gennemgåelig Scoring"
+        formula: "Formular"
+        subtotal: "Subtotal"
         total: "Total"
+        min_score_visibility: "Minimum score for synlighed"
+        score_to_hide: "Score for 'skjul indlæg'"
+        take_action_bonus:
+          name: "tog handling"
+          title: "Når et personale medlem vælger at tage handling, får denne markering en bonus"
+        user_accuracy_bonus:
+          name: "bruger nøjagtighed"
+          title: "Brugere, hvis markeringer er historisk aftalt med, får en bonus."
         trust_level_bonus:
           name: "tillidsniveau"
+          title: "Punkter, der kan gennemgås som er oprettet af brugere af højere tillidsniveau, har en højere score."
+        type_bonus:
+          name: "type bonus"
+          title: "Visse gennemgåelige typer kan tildeles en bonus af personale medlemmer, for at gøre dem til en højere prioritet."
       claim_help:
         optional: "Du kan gøre krav på dette punkt, for at forhindre andre i at gennemgå det."
         required: "Du skal kræve punkter, før du kan gennemgå dem."
@@ -862,6 +878,7 @@ da:
         copied_to_clipboard: "Kopierede til udklipsholder"
         copy_to_clipboard_error: "Fejl ved kopiering til udklipsholder"
         remaining_codes: "Du har <strong>{{count}}</strong> backup koder tilbage."
+        use: "Brug en backup kode"
         enable_prerequisites: "Du skal aktivere en primær anden faktor, før du genererer backup koder."
         codes:
           title: "backup koder genereret"
@@ -869,6 +886,7 @@ da:
       second_factor:
         title: "To-faktor godkendelse"
         enable: "Administrer To-faktor godkendelse"
+        forgot_password: "Glemt kodeord?"
         confirm_password_description: "Bekræft dit kodeord for at fortsætte"
         name: "Navn"
         label: "Kode"
@@ -882,6 +900,7 @@ da:
         extended_description: |
           To-faktor godkendelse tilføjer ekstra sikkerhed til din konto ved at kræve en engangstoken ud over dit kodeord. Tokens kan genereres på <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android-</a> og <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS-</a> enheder.
         oauth_enabled_warning: "Bemærk, at sociale logins deaktiveres, når To-faktor godkendelse er aktiveret på din konto."
+        use: "Brug Autentificeringsapp"
         enforced_notice: "Du skal aktivere To-faktor godkendelse før du kan gå ind på denne side."
         disable: "deaktiver"
         disable_title: "Deaktiver anden faktor"
@@ -889,12 +908,13 @@ da:
         edit: "Rediger"
         edit_title: "Rediger anden faktor"
         edit_description: "Navn på anden faktor"
+        enable_security_key_description: "Når du har din fysiske sikkerhedstast klar, skal du trykke på knappen Registrer nedenfor."
         totp:
           title: "Token-baserede autentificatorer"
           add: "Ny autentifikator"
           default_name: "Min autentifikator"
         security_key:
-          delete: 'Slet'
+          delete: "Slet"
       change_about:
         title: "Skift “Om mig”"
         error: "Der opstod en fejl i ændringen af denne værdi."
@@ -920,9 +940,6 @@ da:
         uploaded_avatar_empty: "Tilføj et brugerdefineret profil billede"
         upload_title: "Upload dit profil billede"
         image_is_not_a_square: "Advarsel: vi har klippet i billedet; bredde og højde var ikke ens."
-      change_profile_background:
-        title: "Profil baggrundsbillede"
-        instructions: "Profil baggrunde vil blive centrerede og have en standard bredde på 850 pixels"
       change_card_background:
         title: "Brugerkort-Baggrund"
         instructions: "Baggrunds billeder vil blive centreret og have en standard bredde på 590px."
@@ -1164,6 +1181,9 @@ da:
       title:
         title: "Titel"
         none: "(ingen)"
+      primary_group:
+        title: "Primær gruppe"
+        none: "(ingen)"
       filters:
         all: "Alle"
       stream:
@@ -1494,7 +1514,6 @@ da:
       link_description: "skriv linkets beskrivelse her"
       link_dialog_title: "Indsæt link"
       link_optional_text: "evt. titel"
-      link_url_placeholder: "https://example.com"
       quote_title: "Citatblok"
       quote_text: "Citatblok"
       code_title: "Præformateret tekst"
@@ -2183,6 +2202,9 @@ da:
         image_upload_not_allowed_for_new_user: "Beklager, nye brugere kan ikke uploade billeder."
         attachment_upload_not_allowed_for_new_user: "Beklager, nye brugere kan ikke uploade vedhæftede filer."
         attachment_download_requires_login: "Beklager, du skal være logget på for at downloade vedhæftede filer."
+      abandon_edit:
+        no_value: "Nej, behold"
+        no_save_draft: "Nej, gem kladde"
       abandon:
         confirm: "Er du sikker på, at du vil droppe dit indlæg?"
         no_value: "Nej"
@@ -2324,7 +2346,6 @@ da:
       tags_allowed_tags: "Begræns disse tags til denne kategori:"
       tags_allowed_tag_groups: "Begræns disse tag grupper til denne kategori:"
       tags_placeholder: "(Valgfri) liste af tiladte mærker"
-      tags_tab_description: "Tags og tag grupper, der er specificeret her, vil kun være tilgængelige i denne kategori og andre kategorier, der også specificerer dem. De er ikke tilgængelige til brug i andre kategorier."
       tag_groups_placeholder: "(Valgfri) liste af tiladte mærke grupper"
       manage_tag_groups_link: "Administrer tag grupper her."
       allow_global_tags_label: "Tillad også andre tags"
@@ -2959,7 +2980,6 @@ da:
               description: "Admins kan se medlemmer af alle grupper."
           membership:
             automatic: Automatisk
-            trust_level: Tillidsniveau
             trust_levels_title: "Tillidsniveau der automatisk tildeles medlemmer når de oprettes:"
             trust_levels_none: "Ingen"
             automatic_membership_email_domains: "Brugere der registrerer med et email domæne der præcist matcher et på denne liste, vil automatisk blive tilføjet til denne gruppe:"
@@ -3958,6 +3978,8 @@ da:
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Inputfelter kan ikke være tomme eller indeholde lodret bjælketegn."
+        default_categories:
+          modal_yes: "Ja"
       badges:
         title: Badges
         new_badge: Nyt Badge
@@ -4104,16 +4126,16 @@ da:
       upload_error: "Beklager, der opstod en fejl ved upload af filen. Prøv venligst igen."
       quit: "Måske senere"
       staff_count:
-        one: "Dit fællesskab har %{count} hjælperteam (dig)."
-        other: "Dit fællesskab har %{count} hjælperteam, inklusive dig."
+        one: "Dit fællesskab har %{count} personale medlem (dig)."
+        other: "Dit fællesskab har %{count} personale medlem, inklusive dig."
       invites:
         add_user: "tilføj"
-        none_added: "Du har ikke inviteret nogen til hjælperteamet. Er du sikker på, at du vil fortsætte?"
+        none_added: "Du har ikke inviteret nogen til dit personale. Er du sikker på, at du vil fortsætte?"
         roles:
           admin: "Admin"
           moderator: "Moderator"
           regular: "Fast bruger"
       previews:
-        topic_title: "Duskussionsemne"
+        topic_title: "Diskussionsemne"
         share_button: "Del"
         reply_button: "Svar"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 989e556660..ee9597f2a6 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -917,14 +917,14 @@ de:
           default_name: "Mein Authentifikator"
         security_key:
           register: "Registrieren"
-          title: 'Sicherheitsschlüssel'
+          title: "Sicherheitsschlüssel"
           add: "Registriere den Sicherheitsschlüssel"
           default_name: "Hauptsicherheitsschlüssel"
           not_allowed_error: "Der Registrierungsvorgang für den Sicherheitsschlüssel ist abgelaufen oder wurde abgebrochen."
           already_added_error: "Du hast diesen Sicherheitsschlüssel bereits registriert. Du musst Ihn nicht erneut registrieren.\e"
-          edit: 'Bearbeite den Sicherheitsschlüssel'
-          edit_description: 'Name des Sicherheitsschlüssels'
-          delete: 'Löschen'
+          edit: "Bearbeite den Sicherheitsschlüssel"
+          edit_description: "Name des Sicherheitsschlüssels"
+          delete: "Löschen"
       change_about:
         title: "„Über mich“ ändern"
         error: "Beim Ändern dieses Wertes ist ein Fehler aufgetreten."
@@ -950,9 +950,6 @@ de:
         uploaded_avatar_empty: "Eigenes Bild hinzufügen"
         upload_title: "Lade dein Bild hoch"
         image_is_not_a_square: "Achtung: Wir haben dein Bild zugeschnitten, weil Höhe und Breite nicht übereingestimmt haben."
-      change_profile_background:
-        title: "Profilhintergrund"
-        instructions: "Hintergrundbilder werden zentriert und haben eine Standardbreite von 850px."
       change_card_background:
         title: "Benutzerkarten-Hintergrund"
         instructions: "Hintergrundbilder werden zentriert und haben eine Standardbreite von 590px."
@@ -1194,6 +1191,9 @@ de:
       title:
         title: "Titel"
         none: "(keiner)"
+      primary_group:
+        title: "Hauptgruppe"
+        none: "(keiner)"
       filters:
         all: "Alle"
       stream:
@@ -1540,7 +1540,6 @@ de:
       link_description: "gib hier eine Link-Beschreibung ein"
       link_dialog_title: "Link einfügen"
       link_optional_text: "Optionaler Titel"
-      link_url_placeholder: "https://example.com"
       quote_title: "Zitat"
       quote_text: "Zitat"
       code_title: "Vorformatierter Text"
@@ -2231,6 +2230,9 @@ de:
         image_upload_not_allowed_for_new_user: "Entschuldige, neue Benutzer dürfen keine Bilder hochladen."
         attachment_upload_not_allowed_for_new_user: "Entschuldige, neue Benutzer dürfen keine Dateien hochladen."
         attachment_download_requires_login: "Entschuldige, du musst angemeldet sein, um Dateien herunterladen zu können."
+      abandon_edit:
+        no_value: "Nein, behalten"
+        no_save_draft: "Nein, speichere den Entwurf"
       abandon:
         confirm: "Möchtest du deinen Beitrag wirklich verwerfen?"
         no_value: "Nein, beibehalten"
@@ -2373,7 +2375,6 @@ de:
       tags_allowed_tags: "Schlagwörter auf diese Kategorie einschränken:"
       tags_allowed_tag_groups: "Schlagwortgruppen auf diese Kategorie einschränken:"
       tags_placeholder: "(Optional) Liste erlaubter Schlagwörter"
-      tags_tab_description: "Hier definierte Schlagwörter und Schlagwort-Gruppen sind nur in dieser Kategorie und in Kategorien, in denen sie ebenfalls definiert sind, verfügbar. In anderen Kategorien sind sie nicht verwendbar."
       tag_groups_placeholder: "(Optional) Liste erlaubter Schlagwort-Gruppen"
       manage_tag_groups_link: "Verwalte hier die Schlagwort-Gruppen."
       allow_global_tags_label: "Erlaube auch andere Schlagwörter."
@@ -3006,7 +3007,6 @@ de:
             publish_read_state: "Auf Gruppen-Benachrichtigungen veröffentliche Gruppen-gelesen-Status"
           membership:
             automatic: Automatisch
-            trust_level: Vertrauensstufe
             trust_levels_title: "Vertrauensstufe, die neuen Mitgliedern automatisch verliehen wird:"
             trust_levels_none: "Keine"
             automatic_membership_email_domains: "Benutzer, deren E-Mail-Domain mit einem der folgenden Listeneinträge genau übereinstimmt, werden automatisch zu dieser Gruppe hinzugefügt:"
@@ -3272,7 +3272,7 @@ de:
           long_title: "Farben, CSS und HTML-Inhalte deiner Seite erweitern"
           edit: "Bearbeiten"
           edit_confirm: "Dies ist ein Remote-Theme, wenn du CSS/HTML bearbeitest, werden deine Änderungen zurückgesetzt, wenn du das Theme das nächste Mal aktualisierst."
-          update_confirm: "Diese lokalen Änderungen werden vom Update gelöscht. Bist du sicher, dass du fortfahren willst?"
+          update_confirm: "Folgendes wird vom Update geändert. Bist du sicher, dass du fortfahren willst?"
           update_confirm_yes: "Ja, fahrte mit dem Update fort"
           common: "Gemeinsam"
           desktop: "Desktop"
@@ -4019,6 +4019,8 @@ de:
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Eingabefelder können nicht leer sein oder vertikale Balkenzeichen enthalten."
+        default_categories:
+          modal_yes: "Ja"
       badges:
         title: Abzeichen
         new_badge: Neues Abzeichen
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index b613743aa6..6fa51098a3 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -631,7 +631,7 @@ el:
         edit: "Επεξεργασία"
         security_key:
           register: "Εγγραφή"
-          delete: 'Σβήσιμο'
+          delete: "Σβήσιμο"
       change_about:
         title: "Άλλαξε τα «σχετικά με εμένα»"
         error: "Προέκυψε σφάλμα στην αλλαγή της αξίας."
@@ -655,9 +655,6 @@ el:
         uploaded_avatar_empty: "Πρόσθεσε μια δική σου εικόνα"
         upload_title: "Ανέβασε την εικόνα σου"
         image_is_not_a_square: "Προσοχή: Περικόψαμε την εικόνα σου γιατί το ύψος και το πλάτος δεν ήταν ίσα."
-      change_profile_background:
-        title: "Φόντο Προφίλ"
-        instructions: "Οι εικόνες που μπαίνουν στο φόντο του προφίλ σου θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 850px."
       change_card_background:
         title: "Φόντο Καρτέλας Χρήστη"
         instructions: "Οι εικόνες στο φόντο θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 590px."
@@ -855,6 +852,8 @@ el:
         header_title: "προφίλ, μηνύματα, σελιδοδείκτες και προτιμήσεις"
       title:
         title: "Τίτλος"
+      primary_group:
+        title: "Κύρια ομάδα"
       filters:
         all: "Όλα"
       stream:
@@ -1653,6 +1652,8 @@ el:
         image_upload_not_allowed_for_new_user: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να ανεβάσουν εικόνες."
         attachment_upload_not_allowed_for_new_user: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να επισυνάψουν αρχεία."
         attachment_download_requires_login: "Λυπούμαστε, για να κατεβάσεις συνημμένα αρχεία, πρέπει πρώτα να συνδεθείς."
+      abandon_edit:
+        no_value: "Όχι, κράτησέ τη"
       abandon:
         confirm: "Σίγουρα θέλεις να απορρίψεις την ανάρτησή σου;"
         no_value: "Όχι, κράτησέ τη"
@@ -2288,7 +2289,6 @@ el:
               staff: "Ιδιοκτήτες ομάδας και συνεργάτες"
           membership:
             automatic: Αυτόματα
-            trust_level: Επίπεδο Εμπιστοσύνης
             trust_levels_title: "Επίπεδο εμπιστοσύνης που δίνεται αυτόματα στα μέλη όταν προστίθενται:"
             trust_levels_none: "Κανένα"
             automatic_membership_email_domains: "Οι χρήστης των οποίων το email domain ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
@@ -3078,6 +3078,8 @@ el:
           search: "Αναζήτηση"
           groups: "Ομάδες"
           dashboard: "Πίνακας ελέγχου"
+        default_categories:
+          modal_yes: "Ναι "
       badges:
         title: Παράσημα
         new_badge: Νέο Παράσημο
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index aeb0acdc58..125fae8223 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2612,7 +2612,7 @@ en:
       allow_global_tags_label: "Also allow other tags"
       tag_group_selector_placeholder: "(Optional) Tag group"
       required_tag_group_description: "Require new topics to have tags from a tag group:"
-      min_tags_from_required_group_label: 'Num Tags:'
+      min_tags_from_required_group_label: "Num Tags:"
       required_tag_group_label: "Tag group:"
       topic_featured_link_allowed: "Allow featured links in this category"
       delete: "Delete Category"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 4a4fd6eff2..6342a134bf 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -47,7 +47,7 @@ es:
           other: "< %{count} s"
         x_seconds:
           one: "%{count}s"
-          other: "%{count} s"
+          other: "%{count}s"
         less_than_x_minutes:
           one: "< %{count}m"
           other: "< %{count} min"
@@ -96,11 +96,11 @@ es:
           one: "hace %{count} día"
           other: "hace %{count} días"
         x_months:
-          one: "Hace %{count} meses"
-          other: "Hace %{count} meses"
+          one: "hace %{count} mes"
+          other: "hace %{count} meses"
         x_years:
-          one: "Hace %{count} años"
-          other: "Hace %{count} años"
+          one: "hace %{count} año"
+          other: "hace %{count} años"
       later:
         x_days:
           one: "%{count} día después"
@@ -330,7 +330,7 @@ es:
         score_to_hide: "Puntuación mínima para ocultar publicación"
         take_action_bonus:
           name: "acción tomada"
-          title: "cuando un miembro del staff decide tomar acciones, se le otorga un bono al reporte"
+          title: "Cuando un miembro del staff decide tomar acciones, se le otorga un bono al reporte."
         user_accuracy_bonus:
           name: "precisión del usuario"
           title: "Los usuarios con los que se ha coincidido en reportes anteriores reciben puntos extra."
@@ -706,7 +706,7 @@ es:
       trust_level: "NC"
       read_time: "tiempo de lectura"
       topics_entered: "temas ingresados"
-      post_count: "# publicaciones"
+      post_count: "# posts"
       confirm_delete_other_accounts: "¿Estás seguro de que quieres eliminar estas cuentas?"
       powered_by: "usando <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "copiado"
@@ -917,14 +917,14 @@ es:
           default_name: "Mi autenticador"
         security_key:
           register: "Registrar"
-          title: 'Claves de seguridad'
+          title: "Claves de seguridad"
           add: "Clave de seguridad de registro"
           default_name: "Clave de seguridad principal"
           not_allowed_error: "El proceso de registro de clave de seguridad fue cancelado o se agotó el tiempo."
           already_added_error: "Ya registraste esta clave de seguridad. No tienes que registrarla de nuevo."
-          edit: 'Editar clave de seguridad'
-          edit_description: 'Nombre de la clave de seguridad'
-          delete: 'Eliminar'
+          edit: "Editar clave de seguridad"
+          edit_description: "Nombre de la clave de seguridad"
+          delete: "Eliminar"
       change_about:
         title: "Cambiar «Acerca de mí»"
         error: "Ha ocurrido un error al cambiar este valor."
@@ -951,8 +951,8 @@ es:
         upload_title: "Sube tu foto"
         image_is_not_a_square: "Advertencia: hemos recortado tu imagen porque la anchura y la altura no eran iguales."
       change_profile_background:
-        title: "Fondo de perfil"
-        instructions: "Los fondos de perfil estarán centrados y tendrán una anchura predeterminada de 850 px."
+        title: "Encabezado del perfil"
+        instructions: "Por defecto, los encabezados de perfil estarán centrados y tendrán una anchura de 1110px."
       change_card_background:
         title: "Fondo de tarjeta de usuario"
         instructions: "Las imágenes de fonodo estarán centradas y tendrán una anchura predeterminada de 590 px."
@@ -1040,7 +1040,7 @@ es:
         contextual: "Contenido nuevo en la página"
       like_notification_frequency:
         title: "Notificar cuando me dan me gusta"
-        always: "Cada vez que mi publicación reciba un me gusta"
+        always: "Siempre"
         first_time_and_daily: "Cuando mi publicación reciba el primer me gusta y luego diariamente si recibe más"
         first_time: "Cuando mi publicación reciba el primer me gusta"
         never: "Nunca"
@@ -1091,7 +1091,7 @@ es:
         search: "escribe para buscar invitaciones..."
         title: "Invitaciones"
         user: "Usuario invitado"
-        sent: "Enviadas"
+        sent: "Enviada"
         none: "Sin invitaciones para mostrar."
         truncated:
           one: "Mostrando la primera invitación."
@@ -1119,7 +1119,7 @@ es:
         time_read: "Tiempo de lectura"
         days_visited: "Días visitados"
         account_age_days: "Antigüedad de la cuenta en días"
-        create: "Enviar una Invitación"
+        create: "Enviar una invitación"
         generate_link: "Copiar enlace de invitación"
         link_generated: "¡Enlace de invitación generado satisfactoriamente!"
         valid_for: "El enlace de invitación solo es válido para esta dirección de correo electrónico: %{email}"
@@ -1172,9 +1172,9 @@ es:
         top_topics: "Temas destacados"
         no_topics: "No hay temas aún."
         more_topics: "Más temas"
-        top_badges: "Insignias destacadas"
-        no_badges: "Todavía no hay insignias."
-        more_badges: "Más insignias"
+        top_badges: "Medallas destacadas"
+        no_badges: "Todavía no hay medallas."
+        more_badges: "Más medallas"
         top_links: "Enlaces destacados"
         no_links: "No hay enlaces aún."
         most_liked_by: "Recibió mas me gusta de"
@@ -1194,6 +1194,9 @@ es:
       title:
         title: "Título"
         none: "(ninguno)"
+      primary_group:
+        title: "Grupo principal"
+        none: "(ninguno)"
       filters:
         all: "Todos"
       stream:
@@ -1265,7 +1268,7 @@ es:
       hide_forever: "no, gracias"
       hidden_for_session: "Vale, te preguntaremos mañana. Recuerda que también puedes usar el botón «Iniciar sesión» para crear una cuenta en cualquier momento."
       intro: "¡Hola! Parece que estás disfrutando la discusión, pero no has creado una cuenta todavía."
-      value_prop: "Cuando cras una cuenta, recordamos exactamente lo que has leído de modo que puedas retomar lo que leías justo donde lo dejaste. También recibes notificaciones, por aquí y por correo electrónico, cuando alguien responde a tus mensajes. ¡También puedes darle «me gusta» a los mensajes para compartir amor! :heartpulse:"
+      value_prop: "Cuando creas una cuenta, recordamos exactamente lo que has leído de modo que puedas retomar lo que leías justo donde lo dejaste. También recibes notificaciones, por aquí y por correo electrónico, cuando alguien responde a tus mensajes. ¡También puedes darle «me gusta» a los mensajes para compartir amor! :heartpulse:"
     summary:
       enabled_description: "Estás viendo un resumen de este tema: las publicaciones más interesantes de acuerdo a la comunidad."
       description: "Hay <b>{{replyCount}}</b> respuestas."
@@ -1298,10 +1301,10 @@ es:
     forgot_password:
       title: "Restablecer contraseña"
       action: "Olvidé mi contraseña"
-      invite: "Ingresa tu nombre de usuario o tu dirección de correo electrónico, y te enviaremos un correo para reestablecer tu contraseña."
+      invite: "Ingresa tu nombre de usuario o tu dirección de correo electrónico, y te enviaremos un correo electrónico para restablecer tu contraseña."
       reset: "Restablecer contraseña"
-      complete_username: "Si una cuenta coincide con el nombre de usuario <b>%{username}</b>, en breve deberías recibir un correo electrónico con las instrucciones para reestablecer tu contraseña."
-      complete_email: "Si una cuenta coincide con <b>%{email}</b>, en breve deberías recibir un correo electrónico con las instrucciones para reestablecer tu contraseña."
+      complete_username: "Si una cuenta coincide con el nombre de usuario <b>%{username}</b>, en breve deberías recibir un correo electrónico con las instrucciones para restablecer tu contraseña."
+      complete_email: "Si una cuenta coincide con <b>%{email}</b>, en breve deberías recibir un correo electrónico con las instrucciones para restablecer tu contraseña."
       complete_username_found: "Encontramos una cuenta que coincide con el usuario <b>%{username}</b>, en breve deberías recibir un correo electrónico con instrucciones para restablecer tu contraseña."
       complete_email_found: "Encontramos una cuenta que coincide con <b>%{email}</b>, deberías recibir en breve un correo electrónico con instrucciones para restablecer tu contraseña."
       complete_username_not_found: "No hay ninguna cuenta que coincida con el nombre de usuario <b>%{username}</b>"
@@ -1358,7 +1361,7 @@ es:
       omniauth_disallow_totp: "Tu cuenta tiene activada la autenticación en dos pasos. Por favor, ingresa usando tu contraseña."
       resend_title: "Volver a enviar el correo electrónico de activación"
       change_email: "Cambiar dirección de correo electrónico"
-      provide_new_email: "Ingresa una dirección de correo electrónico nueva y te reenviaremos el correo de confirmación."
+      provide_new_email: "Ingresa una dirección de correo electrónico nueva y te reenviaremos el correo electrónico de confirmación."
       submit_new_email: "Actualizar dirección de correo electrónico"
       sent_activation_email_again: "Te hemos enviado otro correo electrónico de activación a <b>{{currentEmail}}</b>. Podría tardar algunos minutos en llegar; asegúrate de revisar la carpeta de correo no deseado."
       sent_activation_email_again_generic: "Te hemos enviado otro correo  electrónico de activación. Podría tardar algunos minutos en llegar. Asegúrate de revisar la carpeta de correo no deseado."
@@ -1540,7 +1543,7 @@ es:
       link_description: "Ingresa la descripción del enlace aquí"
       link_dialog_title: "Insertar hipervínculo"
       link_optional_text: "título opcional"
-      link_url_placeholder: "https://ejemplo.com"
+      link_url_placeholder: "Copia una URL o escribe para buscar temas"
       quote_title: "Cita"
       quote_text: "Cita"
       code_title: "Texto preformateado"
@@ -1657,7 +1660,7 @@ es:
         posted: "nueva publicación"
         moved_post: "publicación movida"
         linked: "enlazado"
-        granted_badge: "insignia concedida"
+        granted_badge: "medalla concedida"
         invited_to_topic: "invitado al tema"
         group_mentioned: "grupo mencionado"
         group_message_summary: "nuevos mensajes grupales"
@@ -1721,7 +1724,7 @@ es:
         in_group:
           label: En el grupo
         with_badge:
-          label: Con la insignia
+          label: Con la medalla
         with_tags:
           label: Etiquetado
         filters:
@@ -1752,7 +1755,7 @@ es:
           count:
             label: Número mínimo de publicaciones
           time:
-            label: Publicado
+            label: Publicó
             before: antes de
             after: después de
     hamburger_menu: "ir a otra lista de temas o categoría"
@@ -2093,7 +2096,7 @@ es:
         to_topic_username: "Ingresaste un nombre de usuario. Le enviaremos una notificación con un enlace de invitación a este tema."
         to_username: "Ingresa el nombre de usuario de la persona a la que quieres invitar. Le enviaremos una notificación con un enlace de invitación a este tema."
         email_placeholder: "nombre@ejemplo.com"
-        success_email: "Hemos enviado una invitación por correo electrónico a <b>{{emailOrUsername}}</b>. Te notificaremos cuando cuando esta invitación sea aceptada. Puedes consultar el estado de tus invitaciones en las pestaña invitaciones en tu perfil de usuario."
+        success_email: "Hemos enviado una invitación por correo electrónico a <b>{{emailOrUsername}}</b>. Te notificaremos cuando esta invitación sea aceptada. Puedes consultar el estado de tus invitaciones en las pestaña «Invitaciones» en tu perfil de usuario."
         success_username: " Hemos invitado a ese usuario a participar en este tema."
         error: "Lo sentimos, no pudimos invitar a esa persona. ¿Tal vez ya fue invitada antes? (El número de invitaciones es limitado)"
         success_existing_email: "Ya existe un usuario con el correo <b>{{emailOrUsername}}</b>. Invitamos a ese usuario a participar en este tema."
@@ -2231,6 +2234,11 @@ es:
         image_upload_not_allowed_for_new_user: "Lo sentimos, los usuarios nuevos no pueden subir imágenes."
         attachment_upload_not_allowed_for_new_user: "Lo sentimos, los usuarios nuevos no pueden subir archivos adjuntos."
         attachment_download_requires_login: "Lo sentimos, necesitas haber iniciado sesión para descargar archivos adjuntos."
+      abandon_edit:
+        confirm: "¿Estás seguro de que quieres descartar tus cambios?"
+        no_value: "No, permanecer"
+        no_save_draft: "No, guardar borrador"
+        yes_value: "Sí, descartar edición"
       abandon:
         confirm: "¿Estás seguro de que deseas abandonar tu publicación?"
         no_value: "No, permanecer"
@@ -2275,7 +2283,7 @@ es:
         rebake: "Reconstruir HTML"
         unhide: "Deshacer ocultar"
         change_owner: "Cambiar dueño"
-        grant_badge: "Conceder insignia"
+        grant_badge: "Conceder medalla"
         lock_post: "Bloquear publicación"
         lock_post_description: "impedir que el usuario que realizó esta publicación la edite"
         unlock_post: "Desbloquear publicación"
@@ -2373,10 +2381,14 @@ es:
       tags_allowed_tags: "Restringir estas etiquetas a esta categoría:"
       tags_allowed_tag_groups: "Restringir estos grupos de etiquetas a esta categoría:"
       tags_placeholder: "(Opcional) lista de etiquetas permitidas"
-      tags_tab_description: "Las etiquetas y grupos de etiquetas que se especifican aquí solo se podrán usar en esta categoría y otras categorías que también las tengan especificadas. No estarán disponibles en otras categorías."
+      tags_tab_description: "Las etiquetas y grupos de etiquetas arriba especificadas solo estarán disponibles en esta categoría y en las otras categorías que igualmente lo especifiquen. No se permitirá su uso en otras categorías."
       tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       manage_tag_groups_link: "Gestiona los grupos de etiquetas aquí."
       allow_global_tags_label: "Permitir también otras etiquetas"
+      tag_group_selector_placeholder: "(Opcional) Grupo de etiquetas"
+      required_tag_group_description: "Requiere temas nuevos para tener etiquetas de un grupo de etiquetas:"
+      min_tags_from_required_group_label: 'Número de etiquetas:'
+      required_tag_group_label: "Grupo de etiquetas:"
       topic_featured_link_allowed: "Permitir enlaces destacados en esta categoría"
       delete: "Eliminar categoría"
       create: "Crear categoría"
@@ -2391,7 +2403,7 @@ es:
       topic: "tema de la categoría"
       logo: "Imagen (logo) para la categoría"
       background_image: "Imagen de fondo de la categoría"
-      badge_colors: "Colores de las insignias"
+      badge_colors: "Colores de las medallas"
       background_color: "Color de fondo"
       foreground_color: "Colores de primer plano"
       name_placeholder: "Una o dos palabras máximo"
@@ -2422,7 +2434,7 @@ es:
       sort_order: "Ordenar lista de temas:"
       default_view: "Orden por defecto:"
       default_top_period: "Período por defecto para estar en la parte superior:"
-      allow_badges_label: "Permitir que se concedan insignias en esta categoría"
+      allow_badges_label: "Permitir que se concedan medallas en esta categoría"
       edit_permissions: "Editar permisos"
       reviewable_by_group: "Además del staff, las publicaciones y los reportes en esta categoría también pueden ser revisados por:"
       review_group_name: "nombre del grupo"
@@ -2565,10 +2577,10 @@ es:
         high {con una proporción de me gusta por publicación elevadísima}
         other {}}
     original_post: "Publicación original"
-    views: "Visitas"
+    views: "Vistas"
     views_lowercase:
       one: "visita"
-      other: "visitas"
+      other: "vistas"
     replies: "Respuestas"
     views_long:
       one: "este tema se ha visto %{count} vez"
@@ -2638,7 +2650,7 @@ es:
           other: "{{categoryName}} ({{count}})"
         help: "temas recientes en la categoría {{categoryName}}"
       top:
-        title: "Destacado"
+        title: "Destacados"
         help: "los temas con más actividad en el último año, mes, semana o día"
         all:
           title: "Siempre"
@@ -2739,22 +2751,22 @@ es:
     badges:
       earned_n_times:
         one: "Ganó esta medalla %{count} vez"
-        other: "Insignia ganada %{count} veces"
-      granted_on: "Concedido el %{date}"
-      others_count: "Otras personas con esta insignia (%{count})"
-      title: Insignias
-      allow_title: "Puedes usar esta insignia como título"
-      multiple_grant: "Puedes ganar esta insignia varias veces"
+        other: "Medalla ganada %{count} veces"
+      granted_on: "Concedido hace %{date}"
+      others_count: "Otras personas con esta medalla (%{count})"
+      title: Medallas
+      allow_title: "Puedes usar esta medalla como título"
+      multiple_grant: "Puedes ganar esta medalla varias veces"
       badge_count:
         one: "%{count} medalla"
-        other: "%{count} insignias"
+        other: "%{count} medallas"
       more_badges:
         one: "+%{count} Más"
         other: "+%{count} Más"
       granted:
         one: "%{count} concedido"
         other: "%{count} concedidas"
-      select_badge_for_title: Seleccionar una insignia para utilizar como tu título
+      select_badge_for_title: Selecciona una medalla para utilizar como tu título
       none: "(ninguna)"
       successfully_granted: "%{badge} concedida exitosamente a %{username}"
       badge_grouping:
@@ -2842,6 +2854,7 @@ es:
         parent_tag_description: "Las etiquetas de este grupo no se pueden utilizar a menos que la etiqueta primaria esté presente. "
         one_per_topic_label: "Limitar las etiquetas de este grupo a utilizarse solo una vez por tema"
         new_name: "Nuevo grupo de etiquetas"
+        name_placeholder: "Nombre del grupo de etiquetas:"
         save: "Guardar"
         delete: "Eliminar"
         confirm_delete: "¿Estás seguro de que quieres eliminar este grupo de etiquetas?"
@@ -3000,7 +3013,7 @@ es:
               title: "¿Quién puede ver este grupo?"
               public: "Todos"
               logged_on_users: "Usuarios que hayan iniciado sesión"
-              members: "Propietarios y miembros del grupo"
+              members: "Propietarios de grupos, miembros"
               staff: "Propietarios del grupo y staff"
               owners: "Propietarios del grupo"
               description: "Los administradores pueden ver todos los grupos."
@@ -3010,8 +3023,8 @@ es:
             publish_read_state: "Publicar confirmaciones de lectura en los mensajes grupales"
           membership:
             automatic: Automático
-            trust_level: Nivel de confianza
             trust_levels_title: "Nivel de confianza concedido automáticamente a miembros cuando son añadidos:"
+            effects: Efectos
             trust_levels_none: "Ninguno"
             automatic_membership_email_domains: "Los usuarios que se registren con un dominio de correo electrónico que esté en esta lista se añadirán automáticamente a este grupo:"
             automatic_membership_retroactive: "Aplicar la misma regla de dominio de correo electrónico a los usuarios registrados existentes"
@@ -3044,6 +3057,8 @@ es:
         title: "API"
         key: "Clave de API"
         created: Creado
+        last_used: Usada por última vez
+        never_used: (nunca)
         generate: "Generar clave de API"
         regenerate: "Regenerar"
         revoke: "Revocar"
@@ -3334,7 +3349,7 @@ es:
           public_key: "Conceda la siguiente clave pública de acceso al repositorio:"
           install: "Instalar"
           installed: "Instalado"
-          install_popular: "Popular"
+          install_popular: "Destacados"
           install_upload: "Desde tu dispositivo"
           install_git_repo: "Desde un repositorio git"
           install_create: "Crear nuevo"
@@ -3445,8 +3460,8 @@ es:
           heading: "Personalizar estilo de correo electrónico"
           html: "Plantilla HTML"
           css: "CSS"
-          reset: "Reestablecer ajustes predeterminados"
-          reset_confirm: "¿Estás seguro de que deseas reestablecer los ajustes predeterminados de %{fieldName} y perder todos los cambios?"
+          reset: "Restablecer ajustes predeterminados"
+          reset_confirm: "¿Estás seguro de que deseas restablecer los ajustes predeterminados de %{fieldName} y perder todos los cambios?"
           save_error_with_reason: "Sus cambios no se guardaron. %{error}"
           instructions: "Personalizar la plantilla en la que se crean todos los correos html y el estilo utilizando CSS."
       email:
@@ -3552,7 +3567,7 @@ es:
           staff_user: "Usuario"
           target_user: "Usuario destino"
           subject: "Sujeto"
-          when: "Cuando"
+          when: "Cuándo"
           context: "Contexto"
           details: "Detalles"
           previous_value: "Anterior"
@@ -3574,8 +3589,8 @@ es:
             unsuspend_user: "desbloquear usuario"
             removed_suspend_user: "suspender usuario (eliminado)"
             removed_unsuspend_user: "desbloquear usuario (eliminado)"
-            grant_badge: "conceder insignia"
-            revoke_badge: "retirar insignia"
+            grant_badge: "conceder medalla"
+            revoke_badge: "retirar medalla"
             check_email: "comprobar correo electrónico"
             delete_topic: "eliminar tema"
             recover_topic: "recuperar tema"
@@ -3616,9 +3631,9 @@ es:
             topic_published: "tema publicado"
             post_approved: "publicación aprobada"
             post_rejected: "publicación rechazada"
-            create_badge: "crear insignia"
-            change_badge: "cambiar insignia"
-            delete_badge: "eliminar insignia"
+            create_badge: "crear medalla"
+            change_badge: "cambiar medalla"
+            delete_badge: "eliminar medalla"
             merge_user: "fusionar usuario"
             entity_export: "entidad exportadora"
             change_name: "cambiar nombre"
@@ -3646,7 +3661,7 @@ es:
           url: "URL"
           domain: "Dominio"
         screened_ips:
-          title: "direcciones IP bloqueadas"
+          title: "Direcciones IP bloqueadas"
           description: 'Direcciones IP que están siendo vigiladas. Usa «permitir» para añadir direcciones IP a lista blanca.'
           delete_confirm: "¿Estás seguro de que quieres quitar el bloqueo para %{ip_address}?"
           roll_up_confirm: "¿Estás seguro de que quieres agrupar las direcciones IP bloqueadas vistas con frecuencia en subredes?"
@@ -3684,7 +3699,7 @@ es:
         show_words: "mostrar palabras"
         one_word_per_line: "Una palabra por línea"
         download: Descargar
-        clear_all: Eliminar todo
+        clear_all: Limpiar todo
         clear_all_confirm_block: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «bloquear»?"
         clear_all_confirm_censor: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «censurar»?"
         clear_all_confirm_flag: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «reportar»?"
@@ -3713,7 +3728,7 @@ es:
           upload_successful: "Subida completada. Las palabras se han agregado."
         test:
           button_label: "Prueba"
-          modal_title: "Prueba «%{action}» Palabras vigiladas"
+          modal_title: "Prueba '%{action}' Palabras Vigiladas"
           description: "Escribe el texto más abajo para buscar coincidencias con las palabras vigiladas"
           found_matches: "Coincidencias encontradas:"
           no_matches: "No se encontraron coincidencias"
@@ -3978,7 +3993,7 @@ es:
         none: "ninguno"
       site_settings:
         title: "Ajustes del sitio"
-        no_results: ".No se encontró ningún resultado"
+        no_results: "No se encontró ningún resultado."
         more_than_30_results: "Hay más de 30 resultados. Por favor, refina tu búsqueda o selecciona una categoría."
         clear_filter: "Quitar filtros"
         add_url: "añadir URL"
@@ -4023,48 +4038,52 @@ es:
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Los campos no pueden estar vacíos o contener el carácter de barra vertical."
+        default_categories:
+          modal_description: "¿Quieres aplicar este cambio retroactivamente? Esto cambiará las preferencias de %{count} usuarios existentes."
+          modal_yes: "Sí"
+          modal_no: "No, solo aplicar el cambio a partir de ahora"
       badges:
-        title: Insignias
-        new_badge: Nueva insignia
+        title: Medallas
+        new_badge: Nueva medalla
         new: Nuevo
         name: Nombre
-        badge: Insignia
+        badge: Medalla
         display_name: Nombre que se muestra
         description: Descripción
         long_description: Descripción completa
-        badge_type: Tipo de insignia
+        badge_type: Tipo de medalla
         badge_grouping: Grupo
         badge_groupings:
-          modal_title: Grupos de insignias
+          modal_title: Grupos de medallas
         granted_by: Concedido por
         granted_at: Concedido en
         reason_help: (Enlace a una publicación o tema)
         save: Guardar
         delete: Eliminar
-        delete_confirm: "¿Estás seguro de que quieres eliminar esta insignia?"
+        delete_confirm: "¿Estás seguro de que quieres eliminar esta medalla?"
         revoke: Revocar
         reason: Motivo
         expand: Expandir &hellip;
-        revoke_confirm: "¿Estás seguro de que quieres revocar esta insignia?"
-        edit_badges: Editar insignias
-        grant_badge: Condecer insignia
-        granted_badges: Insignias concedidas
+        revoke_confirm: "¿Estás seguro de que quieres revocar esta medalla?"
+        edit_badges: Editar medallas
+        grant_badge: Conceder medalla
+        granted_badges: Medallas concedidas
         grant: Conceder
-        no_user_badges: "%{name} no ha recibido ninguna insignia."
-        no_badges: No hay insignias que puedan ser concedidas.
-        none_selected: "Selecciona una insignia para empezar"
-        allow_title: Permitir que se use la insignia como título
+        no_user_badges: "%{name} no ha recibido ninguna medalla."
+        no_badges: No hay medallas que puedan ser concedidas.
+        none_selected: "Selecciona una medalla para empezar"
+        allow_title: Permitir que se use la medalla como título
         multiple_grant: Puede ser concedida varias veces
-        listable: Mostrar insignia en la página pública de insignias
-        enabled: Activar insignia
+        listable: Mostrar medalla en la página pública de medallas
+        enabled: Activar medalla
         icon: Icono
         image: Imagen
         icon_help: "ingresa un nombre de icono de Font Awesome (usa el prefijo 'far-' para iconos regulares y 'fab-' para iconos de marca)"
         image_help: "Ingresa la URL de la imagen (sobrescribe el campo del icono si ambos están configurados)"
-        query: Consulta de insignia (SQL)
+        query: Consulta de medalla (SQL)
         target_posts: Publicaciones destino de la consulta
         auto_revoke: Ejecutar diariamente la consulta de revocación
-        show_posts: Mostrar la publicación por la cual se concedió la insignia en la página de insignias
+        show_posts: Mostrar la publicación por la cual se concedió la medalla en la página de medallas
         trigger: Disparador
         trigger_type:
           none: "Actualizar diariamente"
@@ -4074,18 +4093,18 @@ es:
           user_change: "Cuando se edita o se crea un usuario"
           post_processed: "Después de procesar una publicación"
         preview:
-          link_text: "Vista previa de las insignias concedidas"
+          link_text: "Vista previa de las medallas concedidas"
           plan_text: "Vista previa con el plan de ejecución de tu consulta"
-          modal_title: "Vista previa de la consulta para la insignias"
+          modal_title: "Vista previa de la consulta para la medalla"
           sql_error_header: "Ocurrió un error con la consulta."
-          error_help: "Mira los siguientes enlaces para ayudarte con las solicitudes de las insignias"
+          error_help: "Mira los siguientes enlaces para ayudarte con las solicitudes de las medallas"
           bad_count_warning:
             header: "¡ADVERTENCIA!"
-            text: "Faltan algunas muestras muestras de concesiones. Esto ocurre cuando la solicitud de la insignia devuelve ID de usuarios o de publicaciones que no existen. Esto podría causar resultados inesperados más tarde - por favor, revisa de nuevo tu solicitud."
-          no_grant_count: "No hay insignias para asignar."
+            text: "Faltan algunas muestras muestras de concesiones. Esto ocurre cuando la solicitud de la medalla devuelve ID de usuarios o de publicaciones que no existen. Esto podría causar resultados inesperados más tarde - por favor, revisa de nuevo tu solicitud."
+          no_grant_count: "No hay medallas para asignar."
           grant_count:
             one: "<b>%{count}</b> medalla para conceder."
-            other: "<b>%{count}</b> insignias para conceder."
+            other: "<b>%{count}</b> medalla para conceder."
           sample: "Muestra:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -4093,9 +4112,9 @@ es:
             with_post_time: "<span class=\"username\">%{username}</span> por la publicación en %{link} a las <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> a las <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "Selecciona una insignia existente o crea una para empezar"
-          what_are_badges_title: "¿Qué son las insignias?"
-          badge_query_examples_title: "Ejemplos de consultas de insignias"
+          title: "Selecciona una medalla existente o crea una para empezar"
+          what_are_badges_title: "¿Qué son las medallas?"
+          badge_query_examples_title: "Ejemplos de consultas de medallas"
       emoji:
         title: "Emoji"
         help: "Añade emojis nuevos que estarán disponibles para todos. (CONSEJO: arrasta varios archivos a la vez)"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index bc6c5289e1..148f9b3da5 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -685,7 +685,7 @@ et:
         edit: "Muuda"
         security_key:
           register: "Registreeru"
-          delete: 'Kustuta'
+          delete: "Kustuta"
       change_about:
         title: "Muuda minu andmeid"
         error: "Välja muutmisel tekkis viga."
@@ -709,9 +709,6 @@ et:
         uploaded_avatar_empty: "Lisage individuaalne pilt"
         upload_title: "Lae üles oma pilt"
         image_is_not_a_square: "Hoiatus: lõikasime pilti, kuna laius ja kõrgus ei olnud võrdsed."
-      change_profile_background:
-        title: "Profiili taustpilt"
-        instructions: "Profiili taustad tsentreeritakse ja on vaikimisi 850 pikslit laiad."
       change_card_background:
         title: "Kasutajakaardi taustpilt"
         instructions: "Taustapildidd tsentreeritakse ja on vaikimisi 590 pikslit laiad."
@@ -927,6 +924,9 @@ et:
       title:
         title: "Pealkiri"
         none: "(pole)"
+      primary_group:
+        title: "Peamine grupp"
+        none: "(pole)"
       filters:
         all: "Kõik"
       stream:
@@ -1193,7 +1193,6 @@ et:
       link_description: "sisesta viite kirjeldus siia"
       link_dialog_title: "Lisa hüperlink"
       link_optional_text: "valikuline pealkiri"
-      link_url_placeholder: "https://example.com"
       quote_title: "Plokktsitaat"
       quote_text: "Plokktsitaat"
       code_title: "Eelvormindatud tekst"
@@ -1744,6 +1743,8 @@ et:
         image_upload_not_allowed_for_new_user: "Vabandame, uued kasutajad ei saa pilte üles laadida."
         attachment_upload_not_allowed_for_new_user: "Vabandame, uued kasutajad ei saa manuseid üles laadida."
         attachment_download_requires_login: "Vabandame, manuste allalaadimiseks pead olema sisse logitud."
+      abandon_edit:
+        no_value: "Ei, hoia alles"
       abandon:
         confirm: "Oled kindel, et soovid oma postituse hüljata?"
         no_value: "Ei, säilita"
@@ -2362,7 +2363,6 @@ et:
               staff: "Grupi omanikud ja personal"
           membership:
             automatic: Automaatne
-            trust_level: Usalduse tase
             trust_levels_title: "Liikmetele peale lisamist automaatselt omistatud usaldustase:"
             trust_levels_none: "Pole"
             automatic_membership_email_domains: "Kasutajad, kes registreeruvad meiliaadressiga, mille domeen ühtib täpselt mõnega sellest loetelust, lisatakse siia gruppi automaatselt:"
@@ -3127,6 +3127,8 @@ et:
           search: "Otsi"
           groups: "Grupid"
           dashboard: "Armatuurlaud"
+        default_categories:
+          modal_yes: "Jah"
       badges:
         title: Märgised
         new_badge: Uus märgis
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 93e22ec48a..75a9cce7fe 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -901,13 +901,13 @@ fa_IR:
           default_name: "تایید‌کننده من"
         security_key:
           register: "ثبت‌نام"
-          title: 'کلیدهای امنیتی'
+          title: "کلیدهای امنیتی"
           add: "کلید امنیتی را ثبت کنید"
           default_name: "کلید امنیتی اصلی"
           not_allowed_error: "روند ثبت کلید امنیتی به پایان رسیده است یا لغو شده است."
-          edit: 'کلید امنیتی را ویرایش کنید'
-          edit_description: 'نام کلید امنیتی'
-          delete: 'حذف'
+          edit: "کلید امنیتی را ویرایش کنید"
+          edit_description: "نام کلید امنیتی"
+          delete: "حذف"
       change_about:
         title: "تغییر «درباره‌ی من»"
         error: "در فرآیند تغییر این مقدار خطایی روی داد."
@@ -933,9 +933,6 @@ fa_IR:
         uploaded_avatar_empty: "افزودن تصویر سفارشی"
         upload_title: "تصویرتان را بارگذاری کنید"
         image_is_not_a_square: "اخطار: ما تصویر شما را بریدیم; طول و عرض برابر نبود."
-      change_profile_background:
-        title: "پس‌زمینه نمایه"
-        instructions: "تصاویر پس‌زمینه نمایه‌ها در مرکز قرار میگیرند و به صورت پیش‌فرض عرض 850 پیکسل دارند."
       change_card_background:
         title: "پس زمینه کارت کابر"
         instructions: "تصاویر پس زمینه در مرکز قرار خواهند گرفت و عرض پیشفرض آن 590 پیکسل است"
@@ -1177,6 +1174,9 @@ fa_IR:
       title:
         title: "عنوان"
         none: "(هیچی)"
+      primary_group:
+        title: "گروه اصلی"
+        none: "(هیچی)"
       filters:
         all: "همه"
       stream:
@@ -1508,7 +1508,6 @@ fa_IR:
       link_description: "توضیحات لینک را اینجا وارد کنید."
       link_dialog_title: "افزودن پیوند"
       link_optional_text: "عنوان اختیاری"
-      link_url_placeholder: "https://example.com"
       quote_title: "نقل‌قول"
       quote_text: "نقل‌قول"
       code_title: "متن قالب‌بندی شده"
@@ -2175,6 +2174,9 @@ fa_IR:
         image_upload_not_allowed_for_new_user: "با عرض پوزش، کاربران جدید نمی توانند تصویر بار‌گذاری کنند."
         attachment_upload_not_allowed_for_new_user: "با عرض پوزش، کاربران جدید نمی توانند فایل پیوست بار‌گذاری کنند."
         attachment_download_requires_login: "با عرض پوزش، شما برای دانلود فایل پیوست باید وارد سایت شوید."
+      abandon_edit:
+        no_value: "خیر، نگه دار"
+        no_save_draft: "خیر، ذخیره پیش‌نویس"
       abandon:
         confirm: "آیا مطمئن هستید که میخواهید نوشته خود را رها کنید؟"
         no_value: "خیر، نگه دار"
@@ -2903,7 +2905,6 @@ fa_IR:
               description: "مدیران می توانند تمامی گروه‌ها را ببینند. "
           membership:
             automatic: خودکار
-            trust_level: سطح‌اعتماد
             trust_levels_title: "سطح اعتماد به صورت خودکار به اعضایی که اضافه می‌شوند داده می‌شود:"
             trust_levels_none: "هیچ کدام"
             automatic_membership_email_domains: " کاربرانی که با ایمیل دامنه ثبت نام کرده اند،دقیقا شبیه دامنه های لیست، بصورت خودکار به این گروه اضافه می شوند :"
@@ -3745,6 +3746,8 @@ fa_IR:
           search: "جستجو"
           groups: "گروه‌ها"
           dashboard: "پیشخوان"
+        default_categories:
+          modal_yes: "بله"
       badges:
         title: نشان‌ها
         new_badge: نشان جدید
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index f5035515b0..1ef57f2a5c 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -95,6 +95,12 @@ fi:
         x_days:
           one: "%{count} päivä sitten"
           other: "%{count} päivää sitten"
+        x_months:
+          one: "%{count} kuukausi sitten"
+          other: "%{count} kuukautta sitten"
+        x_years:
+          one: "%{count} vuosi sitten"
+          other: "%{count} vuotta sitten"
       later:
         x_days:
           one: "%{count} päivä myöhemmin"
@@ -225,6 +231,7 @@ fi:
       other: "{{count}} merkkiä"
     related_messages:
       title: "Aiheeseen liittyviä keskusteluja"
+      see_all: 'Katso <a href="%{path}">kaikki viestit</a> käyttäjältä @%{username}...'
     suggested_topics:
       title: "Ketjuehdotuksia"
       pm_title: "Keskusteluehdotuksia"
@@ -298,6 +305,8 @@ fi:
     banner:
       close: "Sulje tämä banneri."
       edit: "Muokkaa banneria >>"
+    pwa:
+      install_banner: "Haluatko <a href>asentaa sivuston %{title} tälle laitteelle?</a>"
     choose_topic:
       none_found: "Yhtään ketjua ei löydetty."
       title:
@@ -312,7 +321,25 @@ fi:
       order_by: "Järjestä"
       in_reply_to: "vastauksena"
       explain:
+        why: "selitä miksi tämä päätyi jonoon"
+        title: "Käsittelypisteytys"
+        formula: "Kaava"
+        subtotal: "Välisumma"
         total: "Yhteensä"
+        min_score_visibility: "Näkymisen vähimmäispistemäärä"
+        score_to_hide: "Pistemäärä, joka piilottaa viestin"
+        take_action_bonus:
+          name: "ryhtyi toimiin"
+          title: "Kun henkilökunnnan jäsen ryhtyy toimiin, lippu saa bonuspisteitä."
+        user_accuracy_bonus:
+          name: "käyttäjän tarkkuus"
+          title: "Käyttäjät joiden aiemmista lipuista on oltu samaa mieltä saavat bonuspisteitä."
+        trust_level_bonus:
+          name: "luottamustaso"
+          title: "Korkeampien luottamustasojen käyttäjien luomat käsiteltävät saavat korkeammat pisteet."
+        type_bonus:
+          name: "tyyppibonus"
+          title: "Tietylle käsiteltävälle lajityypille voi henkilökunta määritellä bonuksen, jotta ne saavat korkeamman prioriteetin."
       claim_help:
         optional: "Voit vaatia tämän itsellesi, jolloin muut eivät voi käsitellä sitä."
         required: "Sinun täytyy osoittaa asia itsellesi ennen kuin voit käsitellä sen."
@@ -389,7 +416,14 @@ fi:
         refresh: "Lataa sivu uudelleen"
         status: "Tila"
         category: "Alue"
+        orders:
+          priority: "Prioriteetti"
+          priority_asc: "Prioriteetti (käänteinen)"
+          created_at: "Luotu"
+          created_at_asc: "Luotu (käänteinen)"
         priority:
+          title: "Vähimmäisprioriteetti"
+          low: "(mikä tahansa)"
           medium: "Keskiverto"
           high: "Korkea"
       conversation:
@@ -400,6 +434,7 @@ fi:
         date: "Päivämäärä"
         type: "Tyyppi"
         status: "Tila"
+        submitted_by: "Lähettäjä"
         reviewed_by: "Käsittelijä"
       statuses:
         pending:
@@ -412,10 +447,16 @@ fi:
           title: "Sivuutettu"
         deleted:
           title: "Poistett"
+        reviewed:
+          title: "(kaikki käsitellyt)"
+        all:
+          title: "(kaikki)"
       types:
         reviewable_flagged_post:
           title: "Liputettu viesti"
           flagged_by: "Liputtaja"
+        reviewable_queued_topic:
+          title: "Jonossa oleva ketju"
         reviewable_queued_post:
           title: "Jonossa oleva viesti"
         reviewable_user:
@@ -570,6 +611,7 @@ fi:
         remove_owner: "Peru isännyys"
         remove_owner_description: "Peru käyttäjältä <b>%{username}</b> ryhmän isännyys"
         owner: "Isäntä"
+        forbidden: "Et voi tarkastella jäseniä."
       topics: "Ketjut"
       posts: "Viestit"
       mentions: "Maininnat"
@@ -582,6 +624,7 @@ fi:
         only_admins: "Vain ylläpitäjät"
         mods_and_admins: "Vain ylläpitäjät ja valvojat"
         members_mods_and_admins: "Vain ryhmän jäsenet, valvojat ja ylläpitäjät"
+        owners_mods_and_admins: "Vain ryhmän isännät, valvojat ja ylläpito"
         everyone: "Kaikki"
       notifications:
         watching:
@@ -728,6 +771,7 @@ fi:
       allow_private_messages: "Salli toisten käyttäjien lähettää minulle yksityisviestejä"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
+      enable_defer: "Ota käyttöön lykkäystoiminto, jolla voi merkitä ketjun lukemattomaksi"
       change: "vaihda"
       moderator: "{{user}} on valvoja"
       admin: "{{user}} on ylläpitäjä"
@@ -767,6 +811,7 @@ fi:
       watched_first_post_tags_instructions: "Saat ilmoituksen uusista ketjuista, joilla on joku näistä tunnisteista."
       muted_categories: "Vaimennetut"
       muted_categories_instructions: "Et saa minkäänlaisia ilmoituksia näille alueille luoduista uusista ketjuista. Ketjut eivät näy aluelistauksissa eivätkä tuoreimmissa."
+      muted_categories_instructions_dont_hide: "Et saa ilmoituksia mistään tämän alueen uusiin ketjuihin liittyvästä."
       no_category_access: "Valvojana sinulla on rajoitetut oikeudet alueisiin, et voi tallentaa."
       delete_account: "Poista tilini"
       delete_account_confirm: "Oletko varma, että haluat lopullisesti poistaa käyttäjätilisi? Tätä toimintoa ei voi perua!"
@@ -831,14 +876,19 @@ fi:
         disable: "Poista käytöstä"
         enable: "Ota käyttöön"
         enable_long: "Ota varakoodit käyttöön"
+        manage: "Hallinnoi varakoodeja.. <strong>{{count}}</strong> varakoodia on jäljellä."
         copied_to_clipboard: "Kopioitiin leikepöydälle"
         copy_to_clipboard_error: "Virhe kopioimisessa leikepöydälle"
         remaining_codes: "Sinulla on <strong>{{count}}</strong> varakoodia jäljellä."
+        use: "Käytä varakoodi"
+        enable_prerequisites: "Ensisijainen metodi, kaksivaiheinen tunnistautuminen täytyy ottaa käyttöön ennen varakoodien luomista."
         codes:
           title: "Varakoodit luotiin"
           description: "Jokaista näistä varakoodeista voi käyttää vain kerran. Säilö ne johonkin turvalliseen paikkaan, mistä kuitenkin löydät ne."
       second_factor:
         title: "Kaksivaiheinen tunnistautuminen"
+        enable: "Hallitse kaksivaiheista tunnistautumista"
+        forgot_password: "Unohditko salasanan?"
         confirm_password_description: "Jatka vahvistamalla salasanasi"
         name: "Nimi"
         label: "Koodi"
@@ -852,11 +902,29 @@ fi:
         extended_description: |
           Kaksivaiheinen tunnistautuminen lisää tilisi tietoturvaa vaatimalla kertakäyttöisen koodin salasanan lisäksi. Koodeja voi luoda <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android-</a> ja <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>-laitteilla.
         oauth_enabled_warning: "Huomioi, ettet voi kirjautua some-tilien avulla, jos kaksivaiheinen tunnistautuminen on käytössä."
+        use: "Käytä Authenticator-sovellusta"
         enforced_notice: "Kaksivaiheinen tunnistautuminen pitää ottaa käyttöön, jotta voi käyttää sivustoa."
+        disable: "poista käytöstä"
+        disable_title: "Ota kaksivaiheinen tunnistautuminen käytöstä"
+        disable_confirm: "Oletko varma, että haluat ottaa kaikki kaksivaiheiset tunnistautumismuodot käytöstä?"
         edit: "Muokkaa"
+        edit_title: "Muokkaa kaksivaiheista tunnistautumista"
+        edit_description: "Kaksivaiheisen tunnistautumisen nim"
+        enable_security_key_description: "Kun sinulla on fyysinen tunnistautumislaite kätesi ulottuvilla klikkaa alla olevaa rekisteröitymisnappia."
+        totp:
+          title: "Välineeseen perustuvat tunnistautumiset"
+          add: "Uusi tunnistautumistapa"
+          default_name: "Tunnistautumissovellukseni"
         security_key:
           register: "Rekisteröidy"
-          delete: 'Poista'
+          title: "Turva-avaimet"
+          add: "Rekisteröi tunnistautumislaite"
+          default_name: "Päätunnistautumislaite"
+          not_allowed_error: "Tunnistautumislaitteen rekisteröintiprosessi joko vanheni tai peruutettiin."
+          already_added_error: "Olet jo rekisteröinyt tämän tunnistautumislaitteen. Sitä ei tarvitse rekisteröidä uudelleen."
+          edit: "Muokkaa tunnistautumislaitetta"
+          edit_description: "Tunnistautumislaitteen nimi"
+          delete: "Poista"
       change_about:
         title: "Muokkaa kuvaustasi"
         error: "Arvon muuttamisessa tapahtui virhe."
@@ -882,9 +950,6 @@ fi:
         uploaded_avatar_empty: "Lisää oma kuva"
         upload_title: "Lataa oma kuva"
         image_is_not_a_square: "Varoitus: olemme rajanneet kuvaasti; korkeus ja leveys eivät olleet samoja"
-      change_profile_background:
-        title: "Profiilin taustakuva"
-        instructions: "Profiilin taustakuvan leveys on 850 pikseliä."
       change_card_background:
         title: "Käyttäjäkortin taustakuva"
         instructions: "Taustakuvan leveys on 590 pikseliä."
@@ -907,6 +972,10 @@ fi:
         revoke: "Kumoa yhdistäminen"
         cancel: "Peru"
         not_connected: "(ei liitetty)"
+        confirm_modal_title: "Yhdistä %{provider}-tili"
+        confirm_description:
+          account_specific: "%{provider}-tiliäsi \"%{account_description}\" käytetään tunnistautumiseen."
+          generic: "%{provider}-tiliäsi käytetään tunnistautumiseen."
       name:
         title: "Nimi"
         instructions: "koko nimesi (ei pakollinen)"
@@ -1121,6 +1190,9 @@ fi:
       title:
         title: "Titteli"
         none: "(ei mitään)"
+      primary_group:
+        title: "Ensisijainen ryhmä"
+        none: "(ei mitään)"
       filters:
         all: "Kaikki"
       stream:
@@ -1156,6 +1228,14 @@ fi:
       enabled: "Sivusto on vain luku -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on toistaiseksi poissa käytöstä."
       login_disabled: "Et voi kirjautua sisään, kun sivusto on vain luku -tilassa."
       logout_disabled: "Et voi kirjautua ulos, kun sivusto on vain luku -tilassa."
+    too_few_topics_and_posts_notice: "Laitetaanpa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics}</strong> ketjua ja <strong>%{currentPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan lisää keskusteluita, joita voivat lukea ja joihin vastata. Suosittelemme vähintään <strong>%{requiredTopics}</strong> ketjua ja <strong>%{requiredPosts}</strong> viestiä. Vain henkilökunta näkee tämän viestin."
+    too_few_topics_notice: "Laitetaanpa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics}</strong> ketjua. Uusia kävijöitä varten tarvitaan lisää keskusteluita, joita voivat lukea ja joihin vastata. Suosittelemme vähintään <strong>%{requiredTopics}</strong> ketjua. Vain henkilökunta näkee tämän viestin."
+    too_few_posts_notice: "Laitetaanpa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan lisää keskusteluita, joita voivat lukea ja joihin vastata. Suosittelemme vähintään <strong>%{requiredPosts}</strong> viestiä. Vain henkilökunta näkee tämän viestin."
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/tunti} other {# virhettä/tunti}}</a> saavutti sivustoasetuskynnyksen {limit, plural, one {# virhe/tunti} other {# virhettä/tunti}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}</a> saavutti sivustoasetuskynnyksen {limit, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/tunti} other {# virhettä/tunti}}</a> ylitti sivustoasetuskynnyksen {limit, plural, one {# virhe/tunti} other {# virhettä/tunti}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}</a> ylitti sivustoasetuskynnyksen {limit, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}."
     learn_more: "opi lisää..."
     all_time: "yhteensä"
     all_time_desc: "ketjuja aloitettu yhteensä"
@@ -1211,6 +1291,7 @@ fi:
     trust_level: "Luottamustaso"
     search_hint: "käyttäjätunnus, sähköposti tai IP-osoite"
     create_account:
+      disclaimer: "Kun rekisteröidyt, hyväksyt <a href='{{privacy_link}}' target='blank'>tietosuojaselosteen</a> ja <a href='{{tos_link}}' target='blank'>käyttöehdot</a>."
       title: "Luo uusi tunnus"
       failed: "Jotain meni pieleen. Ehkäpä tämä sähköpostiosoite on jo rekisteröity, kokeile salasana unohtui -linkkiä."
     forgot_password:
@@ -1237,6 +1318,7 @@ fi:
       complete_username_not_found: "Ei löytynyt käyttäjänimeä <b>%{username}</b>"
       complete_email_not_found: "Ei löytynyt sähköpostiosoitetta <b>%{email}</b>"
       confirm_title: "Jatka sivustolle %{site_name}"
+      logging_in_as: "Kirjaudutaan käyttäjänä %{email}"
       confirm_button: Kirjaudu
     login:
       title: "Kirjaudu"
@@ -1244,8 +1326,16 @@ fi:
       password: "Salasana"
       second_factor_title: "Kaksivaiheinen tunnistautuminen"
       second_factor_description: "Syötä sovelluksen antama todennuskoodi:"
+      second_factor_backup: "Kirjaudu käyttäen varakoodia"
       second_factor_backup_title: "Varakoodit"
       second_factor_backup_description: "Syötä yksi varakoodeistasi:"
+      second_factor: "Kirjaudu tunnistautumissovelluksella"
+      security_key_description: "Kun fyysinen tunnistautumislaite on kätesi ulottuvilla, klikkaa alla olevaa \"Tunnistaudu tunnistautumislaitteella\" -painiketta."
+      security_key_alternative: "Et löydä tunnistautumislaitetta tai haluat käyttää muuta tapaa?"
+      security_key_authenticate: "Tunnistaudu tunnistautumislaitteen avulla"
+      security_key_not_allowed_error: "Tunnistaumislaitteella tunnistautumisprosessi joko vanheni tai peruutettiin."
+      security_key_no_matching_credential_error: "Tunnistautumislaitteelta ei löytynyt kelpaavia pääsytietoja."
+      security_key_support_missing_error: "Tämä laitteesi tai selaimesi ei tue tunnistaumislaitteita. Käytä muuta tapaa."
       email_placeholder: "sähköposti tai käyttäjätunnus"
       caps_lock_warning: "Caps Lock on päällä"
       error: "Tuntematon virhe"
@@ -1292,6 +1382,7 @@ fi:
         title: "GitHubilla"
       discord:
         name: "Discord"
+        title: "Discordilla"
       second_factor_toggle:
         totp: "Käytä todennussovellusta tämän sijaan"
         backup_code: "Käytä varmuuskoodia tämän sijaan"
@@ -1312,6 +1403,7 @@ fi:
       apple_international: "Apple/Kansainvälinen"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (aiemmin EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1346,6 +1438,8 @@ fi:
     date_time_picker:
       from: Mistä
       to: Vastaanottaja
+      errors:
+        to_before_from: "Päättymispäivän on oltava myöhempi kuin alkamispäivän."
     emoji_picker:
       filter_placeholder: Etsi emojia
       smileys_&_emotion: Hymiöt ja tunteet
@@ -1395,14 +1489,17 @@ fi:
         category: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet tulee lisätä ryhmään, jolla on pääsy alueelle."
         private: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet tulee kutsua tähän yksityiskeskusteluun."
       duplicate_link: "Näyttää siltä, että <b>@{{username}}</b> linkitti jo samaan kohteeseen <b>{{domain}}</b> ketjun <a href='{{post_url}}'>aiemmassa viestissä {{ago}}</a> – oletko varma, että haluat lähettää sen uudestaan?"
+      reference_topic_title: "RE: {{title}}"
       error:
         title_missing: "Otsikko on pakollinen"
         title_too_short: "Otsikon täytyy olla vähintään {{min}} merkkiä pitkä"
         title_too_long: "Otsikko voi olla korkeintaan {{max}} merkkiä pitkä"
+        post_missing: "Viesti ei voi olla tyhjä"
         post_length: "Viestissä täytyy olla vähintään {{min}} merkkiä"
         try_like: "Oletko kokeillut {{heart}}-nappia?"
         category_missing: "Sinun täytyy valita viestille alue"
         tags_missing: "Valitse vähintään {{count}} tunnistetta"
+        topic_template_not_modified: "Lisää tietoa ketjunaloitukseesi muokkaamalla ketjusapluunaa."
       save_edit: "Tallenna"
       overwrite_edit: "Päällekirjoita"
       reply_original: "Vastaa alkuperäiseen ketjuun"
@@ -1442,7 +1539,7 @@ fi:
       link_description: "kirjoita linkin kuvaus tähän"
       link_dialog_title: "Lisää linkki"
       link_optional_text: "ei-pakollinen kuvaus"
-      link_url_placeholder: "https://esimerkki.fi"
+      link_url_placeholder: "Liitä URL tai etsi ketjua kirjoittamalla"
       quote_title: "Lainaus"
       quote_text: "Lainaus"
       code_title: "Teksti ilman muotoiluja"
@@ -1531,6 +1628,7 @@ fi:
       granted_badge: "Ansaitsit '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Uusi ketju</span> {{description}}"
+      membership_request_accepted: "Hyväksyttiin ryhmään '{{group_name}}'"
       group_message_summary:
         one: "{{count}} viesti ryhmän {{group_name}} saapuneissa"
         other: "{{count}} viestiä ryhmän {{group_name}} saapuneissa"
@@ -1661,6 +1759,7 @@ fi:
     go_back: "mene takaisin"
     not_logged_in_user: "käyttäjäsivu, jossa on tiivistelmä käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset"
     current_user: "siirry omalle käyttäjäsivullesi"
+    view_all: "katso kaikki"
     topics:
       new_messages_marker: "edellinen vierailu"
       bulk:
@@ -1770,7 +1869,10 @@ fi:
       toggle_information: "näytä/kätke ketjun tiedot"
       read_more_in_category: "Haluatko lukea lisää? Selaile muita alueen {{catLink}} ketjuja tai {{latestLink}}."
       read_more: "Haluatko lukea lisää? Selaa aluetta {{catLink}} tai katsele {{latestLink}}."
+      group_request: "Jos haluat nähdä tämän ketjun, hae ryhmän `{{name}}` jäsenyyttä"
+      group_join: "Jos haluat nähdä tämän ketjun, sinun täytyy liittyä ryhmään `{{name}}`"
       group_request_sent: "Ryhmän jäsenyyspyyntösi on lähetetty. Saat ilmoituksen, kun se on hyväksytty."
+      unread_indicator: "Kukaan jäsen ei ole lukenut ketjun viimeistä viestiä vielä."
       read_more_MF: "Sinulla on { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 ketju</a>, jossa on viestejä } other { <a href='{basePath}/unread'># ketjua</a>, joissa on viestejä }} { NEW, plural, =0 {} one { {BOTH, select, true{ja } false { } other{}} <a href='{basePath}/new'>1 uusi</a> ketju} other { {BOTH, select, true{ja } false { } other{}} <a href='{basePath}/new'># uutta ketjua</a>} } lukematta. Tai {CATEGORY, select, true {selaile aluetta {catLink}} false {katsele {latestLink}.} other {}}"
       browse_all_categories: Selaa keskustelualueita
       view_latest_topics: tuoreimpia ketjuja
@@ -1937,6 +2039,9 @@ fi:
         title: "Liputa"
         help: "liputa tämä ketju tai lähetä siitä yksityinen ilmoitus valvojalle"
         success_message: "Ketjun liputus onnistui."
+      make_public:
+        title: "Muuta julkiseksi ketjuksi"
+        choose_category: "Valitse alue julkiselle ketjulle:"
       feature_topic:
         title: "Nosta tämä ketju"
         pin: "Kiinnitä tämä ketju alueen {{categoryLink}} ylimmäiseksi kunnes"
@@ -2125,9 +2230,15 @@ fi:
         image_upload_not_allowed_for_new_user: "Pahoittelut, uudet käyttjät eivät saa ladata kuvia."
         attachment_upload_not_allowed_for_new_user: "Pahoittelut, uudet käyttäjät eivät saa ladata liitteitä."
         attachment_download_requires_login: "Pahoittelut, sinun täytyy kirjautua sisään voidaksesi ladata liitetiedostoja."
+      abandon_edit:
+        confirm: "Haluatko varmasti hylätä tekemäsi muutokset?"
+        no_value: "Ei, säilytän"
+        no_save_draft: "Ei, tallenna luonnos"
+        yes_value: "Kyllä, hylkää muokkaus"
       abandon:
         confirm: "Oletko varma, että haluat hylätä viestisi?"
         no_value: "Ei, säilytä"
+        no_save_draft: "Ei, tallenna luonnos"
         yes_value: "Kyllä, hylkää"
       via_email: "tämä viesti lähetettiin sähköpostitse"
       via_auto_generated_email: "tämä viesti saapui automaattisesti generoituna sähköpostina"
@@ -2141,6 +2252,7 @@ fi:
         reply: "aloita vastaamaan tähän viestiin"
         like: "tykkää viestistä"
         has_liked: "tykkäsit tästä viestistä"
+        read_indicator: "jäsenet jotka ovat lukeneet tämän viestin"
         undo_like: "peru tykkäys"
         edit: "muokkaa viestiä"
         edit_action: "Muokkaa"
@@ -2177,6 +2289,7 @@ fi:
         delete_topic: "poista ketju"
         add_post_notice: "Lisää henkilökuntanootti"
         remove_post_notice: "Poista henkilökuntanootti"
+        remove_timer: "poista ajastin"
       actions:
         flag: "Liputa"
         defer_flags:
@@ -2196,6 +2309,7 @@ fi:
           notify_user: "lähetti viestin"
           bookmark: "lisäsi tämän kirjanmerkkeihin"
           like: "tykkäsi tästä"
+          read: "luki tämän"
           like_capped:
             one: "ja {{count}} muu tykkäsi tästä"
             other: "ja {{count}} muuta tykkäsi tästä"
@@ -2263,7 +2377,6 @@ fi:
       tags_allowed_tags: "Rajaa nämä tunnisteet tälle alueelle:"
       tags_allowed_tag_groups: "Rajaa nämä tunnisteryhmät tälle alueelle:"
       tags_placeholder: "(Ei-pakollinen) lista sallituista tunnisteista"
-      tags_tab_description: "Tässä määritellyt tunnisteet ja tunnisteryhmät ovat käytössä vain tällä alueella sekä muilla alueilla, jotka samalla tapaa ovat ne määritelleet. Muilla alueilla ne eivät ole käytettävissä."
       tag_groups_placeholder: "(Ei-pakollinen) lista sallituista tunnisteryhmistä"
       manage_tag_groups_link: "Hallitse tunnisteryhmiä tästä."
       allow_global_tags_label: "Salli myös muut tunnisteet"
@@ -2296,6 +2409,7 @@ fi:
       special_warning: "Varoitus: Tämä on valmiiksi luotu alue, ja sen turvallisuusasetuksia ei voi muuttaa. Jos et näe käyttöä alueelle, älä muuta sen tarkoitusta vaan poista se."
       uncategorized_security_warning: "Tämä alue on erityinen. Se on tarkoitettu säilytyspaikaksi ketjuille, joilla ei ole aluetta; sille ei voi määritellä turvallisuusasetuksia."
       uncategorized_general_warning: 'Tämä alue on erityinen. Se on oletusalue uusille ketjuille, joille ei ole valittu aluetta. Jos et kaipaa tätä ja haluat mieluummin pakottaa valitsemaan alueen, <a href="%{settingLink}">ota asetus pois käytöstä täällä</a>. Jos haluat vaihtaa nimeä tai kuvasta, mene <a href="%{customizeLink}">Mukauta / Tekstit</a>.'
+      pending_permission_change_alert: "Et ole lisännyt ryhmää %{group} tälle alueelle; lisää klikkaamalla tätä."
       images: "Kuvat"
       email_in: "Saapuvan postin sähköpostiosoite:"
       email_in_allow_strangers: "Hyväksy sähköpostit anonyymeiltä käyttäjiltä joilla ei ole tiliä"
@@ -2443,6 +2557,8 @@ fi:
         help: "Tämä ketju on kiinnitetty sinulle; se näytetään alueensa ensimmäisenä"
       unlisted:
         help: "Tämä ketju on poistettu listauksista; sitä ei näytetä ketjulistauksissa vaan siihen pääsee vain suoran linkin kautta"
+      personal_message:
+        title: "Tämä ketju on yksityiskeskustelu"
     posts: "Viestejä"
     posts_long: "tässä ketjussa on {{number}} viestiä"
     posts_likes_MF: |
@@ -2585,6 +2701,7 @@ fi:
         up_down: "%{shortcut} Siirrä valintaa &uarr; &darr;"
         open: "%{shortcut} Avaa valittu ketju"
         next_prev: "%{shortcut} Seuraava/edellinen valinta"
+        go_to_unread_post: "%{shortcut} Mene ensimmäiseen lukemattomaan viestiin"
       application:
         title: "Ohjelma"
         create: "%{shortcut} Aloita uusi ketju"
@@ -2621,6 +2738,7 @@ fi:
         mark_tracking: "%{shortcut} Seuraa ketjua"
         mark_watching: "%{shortcut} Tarkkaile ketjua"
         print: "%{shortcut} Tulosta ketju"
+        defer: "%{shortcut} Lykkää ketjua"
     badges:
       earned_n_times:
         one: "Ansaitsi tämän ansiomerkin yhden kerran"
@@ -2721,6 +2839,7 @@ fi:
         about: "Lisää tunnisteita ryhmiin, jotta niitä on helpompi hallita"
         new: "Uusi ryhmä"
         tags_label: "Tunnisteet tässä ryhmässä"
+        tags_placeholder: "tunnisteet"
         parent_tag_label: "Emotunniste:"
         parent_tag_placeholder: "Ei pakollinen"
         parent_tag_description: "Tämän ryhmän tunnisteita voi käyttää vain, jos emotunniste on asetettu"
@@ -2836,6 +2955,8 @@ fi:
           view_table: "taulukko"
           view_graph: "graafi"
           refresh_report: "Päivitä raportti"
+          start_date: "Alkamisajankohta (UTC)"
+          end_date: "Päättymisajankohta (UTC)"
           groups: "Kaikki ryhmät"
           disabled: "Raportti ei ole käytössä"
           totals_for_sample: "Otos yhteensä"
@@ -2881,11 +3002,19 @@ fi:
             visibility_levels:
               title: "Kuka näkee ryhmän?"
               public: "Kaikki"
+              logged_on_users: "Sisäänkirjautuneet käyttäjät"
+              members: "Ryhmän isännät, jäsenet"
               staff: "Ryhmän isännät ja henkilökunta"
+              owners: "Ryhmän isännät"
+              description: "Ylläpitäjät näkevät kaikki ryhmät."
+            members_visibility_levels:
+              title: "Kuka voi tarkastella tämän ryhmän jäseniä?"
+              description: "Ylläpitäjät voivat tarkastella kaikkien ryhmien jäseniä."
+            publish_read_state: "Ryhmäviesteissä näytä kuka on lukenut"
           membership:
             automatic: Automaattinen
-            trust_level: Luottamustaso
             trust_levels_title: "Luottamustaso joka automaattisesti myönnetään käyttäjälle, kun hänet liitetään:"
+            effects: Vaikutukset
             trust_levels_none: "Ei mitään"
             automatic_membership_email_domains: "Käyttäjä, joka rekisteröityy sähköpostiverkkotunnuksella joka täsmää tähän luetteloon, liitetään ryhmään automaattisesti:"
             automatic_membership_retroactive: "Liitä olemassaolevia rekisteröityneitä käyttäjiä soveltaen samaa sähköpostiverkkotunnussääntöä "
@@ -2918,6 +3047,8 @@ fi:
         title: "Rajapinta"
         key: "Rajapinnan avain"
         created: Luotu
+        last_used: Viimeksi käytetty
+        never_used: (ei koskaan)
         generate: "Luo"
         regenerate: "Tee uusi"
         revoke: "Peruuta"
@@ -2987,6 +3118,9 @@ fi:
         reviewable_event:
           name: "Käsittelytapahtuma"
           details: "Kun uusi asia tulee käsiteltäväksi tai kun sen tila muuttuu."
+        notification_event:
+          name: "Ilmoitustapahtuma"
+          details: "Kun käyttäjä saa ilmoituksen syötteeseensä."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -3172,6 +3306,7 @@ fi:
           inactive_themes: "Teemat, jotka eivät käytössä:"
           inactive_components: "Käyttämättömät komponentit:"
           broken_theme_tooltip: "Teeman CSS:ssä, HTML:ssä tai YAML:ssä on virheitä"
+          disabled_component_tooltip: "Komponentti ei ole käytössä"
           default_theme_tooltip: "Tämä on sivuston oletusteema"
           updates_available_tooltip: "Teemalle on päivityksiä saatavilla"
           and_x_more: "ja {{count}} muuta."
@@ -3197,6 +3332,7 @@ fi:
           delete_upload_confirm: "Poista ladattu tiedosto? (Teeman CSS voi lakata toimimasta!)"
           import_web_tip: "Tietovarasto, jossa teema on"
           import_web_advanced: "Lisäasetukset..."
+          import_file_tip: ".tar.gz, .zip, tai .dcstyle.json tiedosto, jossa teema on"
           is_private: "Teema on yksityisessä git-tietovarastossa"
           remote_branch: "Haaran nimi (valinnainen)"
           public_key: "Anna repositorioon pääsy seuraavalle julkiselle avaimelle:"
@@ -3213,6 +3349,8 @@ fi:
           source_url: "Lähde"
           enable: "Ota käyttöön"
           disable: "Poista käytöstä"
+          disabled: "Tämä komponentti ei ole käytössä."
+          disabled_by: "Komponentin on ottanut käytöstä"
           required_version:
             error: "Teema poistettiin automaattisesti käytöstä, koska se ei ole yhteensopiva tämän Discourse-version kanssa."
             minimum: "Vaatii Discourse-version {{version}}tai uudemman."
@@ -3232,6 +3370,7 @@ fi:
             other: "Teema on {{count}} muutosta perässä!"
           compare_commits: "(Näytä uudet muutokset)"
           repo_unreachable: "Teeman Git-tietovarastoon yhdistäminen epäonnistui. Virheviesti:"
+          imported_from_archive: "Tämä teema tuotiin .zip-tiedostosta"
           scss:
             text: "CSS"
             title: "Lisää mukautettua CSS:ää, hyväksymme käyvät CSS- ja SCSS-tyylit"
@@ -3301,8 +3440,18 @@ fi:
           love:
             name: "tykkäys"
             description: "Tykkäyspainikkeen väri."
+        robots:
+          title: "Syrjäytä sivustosi robots.txt -tiedosto:"
+          warning: "Tämä pysyvästi käy yli kaikista asiaan liittyvistä sivustoasetuksista."
+          overridden: Sivustosi robots.txt -oletustiedosto on syrjäytetty.
         email_style:
+          title: "Sähköpostin tyyli"
+          heading: "Mukauta sähköpostin tyyliä"
+          html: "HTML-malli"
           css: "CSS"
+          reset: "Palauta oletus"
+          reset_confirm: "Oletko varma että haluat palauttaa oletus %{fieldName} ja hylätä kaikki tekemästi muutokset?"
+          save_error_with_reason: "Muutoksia ei tallennettu. %{error}"
       email:
         title: "Sähköpostit"
         settings: "Asetukset"
@@ -3485,6 +3634,9 @@ fi:
             embeddable_host_create: "loi upotusisännän"
             embeddable_host_update: "muutti upotusisäntää"
             embeddable_host_destroy: "poisti upotusisännän"
+            change_theme_setting: "muutti teema-asetusta"
+            disable_theme_component: "otti teemakomponentin käytöstä"
+            enable_theme_component: "otti teemakomponentin käyttöön"
         screened_emails:
           title: "Seulottavat sähköpostiosoitteet"
           description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä."
@@ -3533,8 +3685,13 @@ fi:
         search: "haku"
         clear_filter: "Tyhjennä"
         show_words: "näytä sanat"
+        one_word_per_line: "Yksi sana per rivi"
         download: Lataa
         clear_all: Tyhjennä kaikki
+        clear_all_confirm_block: "Haluatko varmasti pyyhkiä kaikki estetyt sanat?"
+        clear_all_confirm_censor: "Haluatko varmasti pyyhkiä kaikki sensuroidut sanat?"
+        clear_all_confirm_flag: "Haluatko varmasti pyyhkiä kaikki liputettavat sanat?"
+        clear_all_confirm_require_approval: "Haluatko varmasti pyyhkiä kaikki hyväksyttäviksi vietävät sanat?"
         word_count:
           one: "%{count} sana"
           other: "%{count} sanaa"
@@ -3555,9 +3712,13 @@ fi:
           add: "Lisää"
           success: "Onnistui"
           exists: "On jo olemassa"
+          upload: "Lisää tiedostosta"
           upload_successful: "Lataus onnistui. Sanoja lisättiin."
         test:
           button_label: "Testi"
+          modal_title: "Testaa '%{action}' -tyypin tarkkailtuja sanoja"
+          description: "Tarkastele tekstin osuvuutta tarkkailtuihin sanoihin kirjoittamalla alle"
+          found_matches: "Löytyneitä osumia:"
           no_matches: "Ei osumia"
       impersonate:
         title: "Esiinny käyttäjänä"
@@ -3753,6 +3914,8 @@ fi:
           likes_received: "Saatuja tykkäyksiä"
           likes_received_days: "Saadut tykkäykset: uniikit päivät"
           likes_received_users: "Saadut tykkäykset: uniikit käyttäjät"
+          suspended: "Hyllytettty (viimeiset 6 kuukautta)"
+          silenced: "Hiljennetty (viimeiset 6 kuukautta)"
           qualifies: "Täyttää luottamustaso 3:n vaatimukset."
           does_not_qualify: "Ei täytä luottamustaso 3:n vaatimuksia."
           will_be_promoted: "Ylennetään piakkoin."
@@ -3863,6 +4026,10 @@ fi:
           dashboard: "Hallintapaneeli"
         secret_list:
           invalid_input: "Syöttökenttä ei voi olla tyhjä tai sisältää putkimerkkiä."
+        default_categories:
+          modal_description: "Haluatko soveltaa tätä muutosta takautuvasti? Tämä muuttaa kaikkien %{count} olemassa olevan käyttäjän käyttäjäasetusta."
+          modal_yes: "Kyllä"
+          modal_no: "Ei, muutosta sovellettakoon vain tästedes"
       badges:
         title: Ansiomerkit
         new_badge: Uusi ansiomerkki
@@ -3899,6 +4066,7 @@ fi:
         enabled: Ota ansiomerkki käyttöön
         icon: Ikoni
         image: Kuva
+        icon_help: "Anna Font Awesome -ikonin nimi (käytä etuliitetty \"far-\" tavallisista ja \"fab-\" brändi-ikoneista)"
         image_help: "Syötä kuvan URL (kumoaa ikonikentän, jos molemmat on asetettu)"
         query: Ansiomerkkien haku tietokannasta (SQL)
         target_posts: Tietokantakyselyn kohdeviestit
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index e98adf0f36..41b88a8ba5 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -95,6 +95,12 @@ fr:
         x_days:
           one: "il y a %{count} jour"
           other: "il y a %{count} jours"
+        x_months:
+          one: "il y a %{count} mois"
+          other: "il y a %{count} mois"
+        x_years:
+          one: "il y a %{count} an"
+          other: "il y a %{count} ans"
       later:
         x_days:
           one: "%{count} jour plus tard"
@@ -316,6 +322,8 @@ fr:
       in_reply_to: "en réponse à"
       explain:
         total: "Total"
+        trust_level_bonus:
+          name: "niveau de confiance"
       claim_help:
         optional: "Vous pouvez réserver cet élément pour empêcher d'autres de le vérifier."
         required: "Vous devez réserver des éléments avant des les vérifier."
@@ -858,6 +866,7 @@ fr:
         copied_to_clipboard: "Copié dans le presse-papiers"
         copy_to_clipboard_error: "Erreur en copiant les données dans le presse-papiers"
         remaining_codes: "Vous avez <strong>{{count}}</strong> codes de secours restants."
+        use: "Utiliser un code de secours"
         enable_prerequisites: "Vous devez activer un second facteur principal avant de générer des codes de sauvegarde."
         codes:
           title: "Codes de secours générés"
@@ -865,6 +874,7 @@ fr:
       second_factor:
         title: "Authentification à deux facteurs"
         enable: "Paramètres d'authentification à deux facteurs"
+        forgot_password: "Mot de passe oublié ?"
         confirm_password_description: "Merci de confirmer votre mot de passe pour continuer"
         name: "Nom"
         label: "Code"
@@ -877,6 +887,7 @@ fr:
           Protéger votre compte avec des codes de sécurité à usage unique.
         extended_description: "L'authentification à deux facteurs ajoute une sécurité supplémentaire à votre compte en exigeant un jeton unique en \nplus de votre mot de passe. Les jetons peuvent être générés sur les appareils <a href=\"https://www.google.com/search?q=authenticator+apps+for+android\" target='_blank'>Android</a> et <a href=\"https://www.google.com/search?q=authenticator+apps+for+ios\">iOS</a>.\n"
         oauth_enabled_warning: "Veuillez noter que les connexions sociales seront désactivées une fois que l'authentification à deux facteurs aura été activée sur votre compte."
+        use: "Utiliser l'application Authenticator"
         enforced_notice: "Vous devez activer l'authentification à deux facteurs pour accéder à ce site."
         disable: "désactiver"
         disable_title: "Désactiver le second facteur"
@@ -884,13 +895,21 @@ fr:
         edit: "Modifier"
         edit_title: "Modifier le second facteur"
         edit_description: "Nom du second facteur"
+        enable_security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton Enregistrer ci-dessous."
         totp:
           title: "Authentificateurs à base de jetons"
           add: "Nouveau Authentificateur"
           default_name: "Mon Authentificateur"
         security_key:
-          register: "Créer"
-          delete: 'Supprimer'
+          register: "Enregistrer"
+          title: "Clés de sécurité"
+          add: "Enregistrer une clé de sécurité"
+          default_name: "Clé de sécurité principale"
+          not_allowed_error: "La procédure d'enregistrement de la clé de sécurité a expiré ou a été annulée."
+          already_added_error: "Vous avez déjà enregistré cette clé de sécurité. Vous n'avez pas besoin de le faire à nouveau."
+          edit: "Modifier la clé de sécurité"
+          edit_description: "Nom de la clé de sécurité"
+          delete: "Supprimer"
       change_about:
         title: "Modifier À propos de moi"
         error: "Il y a eu une erreur lors de la modification de cette valeur."
@@ -918,7 +937,7 @@ fr:
         image_is_not_a_square: "Attention : nous avons découpé votre image ; la largeur et la hauteur n'étaient pas égales."
       change_profile_background:
         title: "Arrière-plan du profil"
-        instructions: "Les arrière-plans du profil seront centrés avec une largeur par défaut de 850 pixels."
+        instructions: "Les arrière-plans du profil seront centrés avec une largeur par défaut de 1110 pixels."
       change_card_background:
         title: "Arrière-plan de la carte de l'utilisateur"
         instructions: "Les images d'arrière-plan seront centrées avec une largeur par défaut de 590 pixels."
@@ -1160,6 +1179,9 @@ fr:
       title:
         title: "Titre"
         none: "(aucun)"
+      primary_group:
+        title: "Groupe principal"
+        none: "(aucun)"
       filters:
         all: "Tous"
       stream:
@@ -1290,8 +1312,16 @@ fr:
       password: "Mot de passe"
       second_factor_title: "Authentification à deux facteurs"
       second_factor_description: "Veuillez saisir le code d'authentification de votre app :"
+      second_factor_backup: "Se connecter avec un code de secours"
       second_factor_backup_title: "Authentification à deux facteurs (code de secours)"
       second_factor_backup_description: "Veuillez entrer un de vos codes de secours :"
+      second_factor: "Se connecter avec une application"
+      security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton S'authentifier avec une clé de sécurité ci-dessous."
+      security_key_alternative: "Vous ne trouvez pas votre clé de sécurité ou voulez utiliser une autre méthode ?"
+      security_key_authenticate: "S'authentifier avec une clé de sécurité"
+      security_key_not_allowed_error: "La procédure d'authentification de la clé de sécurité a expiré ou a été annulée."
+      security_key_no_matching_credential_error: "Aucun identifiant correspondant n'a pu être trouvé dans la clé de sécurité donnée."
+      security_key_support_missing_error: "Votre appareil ou navigateur actuel ne supporte pas l'utilisation de clés de sécurité. Veuillez utiliser une autre méthode."
       email_placeholder: "courriel ou pseudo"
       caps_lock_warning: "Majuscules vérrouillées"
       error: "Erreur inconnue"
@@ -1338,6 +1368,7 @@ fr:
         title: "via GitHub"
       discord:
         name: "Discord"
+        title: "avec Discord"
       second_factor_toggle:
         totp: "Utilisez plutôt une application d'authentification"
         backup_code: "Utilisez plutôt un code de secours"
@@ -1358,6 +1389,7 @@ fr:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (précédemment EmojiOne)"
       win10: "Win10"
       google_classic: "Classique Google"
       facebook_messenger: "Facebook Messenger"
@@ -1448,10 +1480,12 @@ fr:
         title_missing: "Le titre est obligatoire."
         title_too_short: "Le titre doit avoir au moins {{min}} caractères"
         title_too_long: "Le titre ne doit pas dépasser les {{max}} caractères"
+        post_missing: "Le message ne peut être vide"
         post_length: "Le message doit avoir au moins {{min}} caractères"
         try_like: "Avez-vous essayé le bouton {{heart}} ?"
         category_missing: "Vous devez choisir une catégorie"
         tags_missing: "Vous devez choisir au moins {{count}} étiquettes"
+        topic_template_not_modified: "Veuillez ajouter des détails à votre topic en modifiant le modèle de sujet."
       save_edit: "Sauvegarder"
       overwrite_edit: "Ecraser la modification"
       reply_original: "Répondre sur le sujet d'origine"
@@ -1491,7 +1525,7 @@ fr:
       link_description: "saisir ici la description du lien"
       link_dialog_title: "Insérer le lien"
       link_optional_text: "titre optionnel"
-      link_url_placeholder: "https://example.com"
+      link_url_placeholder: "Coller une URL ou tapez pour chercher des sujets"
       quote_title: "Citation"
       quote_text: "Citation"
       code_title: "Texte préformaté"
@@ -1824,6 +1858,7 @@ fr:
       group_request: "Effectuez une demande d'adhésion au groupe `{{name}}` pour afficher ce sujet."
       group_join: "Vous devez rejoindre le groupe `{{name}}` pour voir ce sujet"
       group_request_sent: "Votre demande d'adhésion au groupe a été envoyée. Vous serez averti de son acceptation."
+      unread_indicator: "Aucun membre n'a encore lu le dernier message de ce topic."
       read_more_MF: "Il y { UNREAD, plural, =0 {} one { a <a href='{basePath}/unread'>1 sujet non lu</a> } other { a <a href='{basePath}/unread'># sujets non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false {a } other{}} <a href='{basePath}/new'>1 nouveau sujet</a> } other { {BOTH, select, true{et } false {a } other{}} <a href='{basePath}/new'># nouveaux sujets</a> } } restant, ou {CATEGORY, select, true {consulter les autres sujets dans {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Voir toutes les catégories
       view_latest_topics: voir les derniers sujets
@@ -2181,6 +2216,11 @@ fr:
         image_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer d'images."
         attachment_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer de fichier."
         attachment_download_requires_login: "Désolé, vous devez être connecté pour télécharger une pièce jointe."
+      abandon_edit:
+        confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
+        no_value: "Non, garder"
+        no_save_draft: "Non, enregistrer le brouillon"
+        yes_value: "Oui, annuler la modification"
       abandon:
         confirm: "Êtes-vous sûr de vouloir abandonner votre message ?"
         no_value: "Non, le conserver"
@@ -2323,10 +2363,13 @@ fr:
       tags_allowed_tags: "Réserver l'utilisation de ces étiquettes à cette catégorie :"
       tags_allowed_tag_groups: "Réserver l'utilisation de ces groupes d'étiquettes à cette catégorie :"
       tags_placeholder: "(Facultatif) liste des étiquettes autorisées"
-      tags_tab_description: "Les étiquettes et les groupes d'étiquettes spécifiés ici ne seront disponibles que dans cette catégorie ainsi que dans toutes les catégories qui contiennent les mêmes spécifications. Ces étiquettes ne pourront pas être utilisées dans d'autres catégories."
+      tags_tab_description: "Les étiquettes et les groupes d'étiquettes spécifiés au dessus ne seront disponibles que dans cette catégorie ainsi que dans toutes les catégories qui contiennent les mêmes spécifications. Ces étiquettes ne pourront pas être utilisées dans d'autres catégories."
       tag_groups_placeholder: "(Facultatif) liste des groupes de étiquettes autorisées"
       manage_tag_groups_link: "Gérer les groupes d'étiquettes ici."
       allow_global_tags_label: "Permettre aussi d'autres étiquettes"
+      tag_group_selector_placeholder: "(Facultatif) Groupe d'étiquettes"
+      min_tags_from_required_group_label: 'Nombre d''étiquettes :'
+      required_tag_group_label: "Groupe d'étiquettes :"
       topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       delete: "Supprimer la catégorie"
       create: "Nouvelle catégorie"
@@ -2805,6 +2848,7 @@ fr:
         parent_tag_description: "Les étiquette de ce groupe ne peuvent pas être utilisées sauf si l'étiquette parent est présente."
         one_per_topic_label: "Limiter à une étiquette de ce groupe par sujet"
         new_name: "Nouveau groupe d'étiquettes"
+        name_placeholder: "Nom du groupe d'étiquette"
         save: "Sauvegarder"
         delete: "Supprimer"
         confirm_delete: "Êtes-vous sûr de vouloir supprimer ce groupe d'étiquettes ?"
@@ -2968,10 +3012,11 @@ fr:
               owners: "Propriétaires du groupe"
               description: "Les administrateurs peuvent voir tous les groupes."
             members_visibility_levels:
+              title: "Qui peut voir les membres de ce groupe ?"
               description: "Les administrateurs peuvent voir les membres de tous les groupes."
+            publish_read_state: "Publier le statut de lecture du groupe lors des messages directs de groupe"
           membership:
             automatic: Automatique
-            trust_level: Niveau de confiance
             trust_levels_title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés :"
             trust_levels_none: "Aucun"
             automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe :"
@@ -3005,6 +3050,8 @@ fr:
         title: "API"
         key: "Clé API"
         created: Créé
+        last_used: Dernière utilisation
+        never_used: (jamais)
         generate: "Générer"
         regenerate: "Regénérer"
         revoke: "Révoquer"
@@ -3327,6 +3374,7 @@ fr:
             other: "Le thème est en retard de {{count}} commits !"
           compare_commits: "(Voir les nouveaux changements)"
           repo_unreachable: "Le dépôt Git de ce thème reste inaccessible. Message d'erreur : "
+          imported_from_archive: "Ce thème a été importé depuis un fichier .zip"
           scss:
             text: "CSS"
             title: "Entrez du CSS personnalisé, nous acceptons tous les styles CSS et SCSS valides."
@@ -3983,6 +4031,10 @@ fr:
           dashboard: "Tableau de bord"
         secret_list:
           invalid_input: "Les champs de saisi ne peuvent pas être vide ou contenir le caractère barre verticale"
+        default_categories:
+          modal_description: "Voulez-vous appliquer ce changement rétroactivement ? Cela changera les préférences de %{count} utilisateurs existants."
+          modal_yes: "Oui"
+          modal_no: "Non, appliquer ce changement à partir de maintenant"
       badges:
         title: Badges
         new_badge: Nouveau badge
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 23a141ca81..a6027b46fd 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -512,7 +512,7 @@ gl:
         name: "Nome"
         edit: "Editar"
         security_key:
-          delete: 'Eliminar'
+          delete: "Eliminar"
       change_about:
         title: "Cambiar «Verbo de min»"
       change_username:
@@ -534,9 +534,6 @@ gl:
         uploaded_avatar_empty: "Engadir unha imaxe personalizada"
         upload_title: "Envía a túa imaxe"
         image_is_not_a_square: "Aviso: recortamos a túa imaxe; a largura e a altura eran distintas."
-      change_profile_background:
-        title: "Fondo do perfil"
-        instructions: "Os fondos dos perfís centraranse e terán unha largura predeterminada de 850px."
       change_card_background:
         title: "Fondo das fichas dos usuarios"
         instructions: "As imaxes dos fondos centraranse e terán unha largura predeterminada de 590px."
@@ -687,6 +684,8 @@ gl:
         header_title: "perfil, mensaxes, marcadores e preferencias"
       title:
         title: "Título"
+      primary_group:
+        title: "Grupo primario"
       filters:
         all: "Todo"
       stream:
@@ -1275,6 +1274,8 @@ gl:
         image_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden subir imaxes."
         attachment_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden subir anexos."
         attachment_download_requires_login: "Sentímolo pero debes iniciar sesión para descargar anexos."
+      abandon_edit:
+        no_value: "Non, seguir"
       abandon:
         confirm: "Confirmas o abandono da túa publicación?"
         no_value: "Non, seguir"
@@ -1749,7 +1750,6 @@ gl:
               public: "Todos"
           membership:
             automatic: Automático
-            trust_level: Nivel de confianza
             trust_levels_title: "Nivel de confianza automático concedido aos membros cando son engadidos:"
             trust_levels_none: "Ningún"
             automatic_membership_email_domains: "Os usuarios que se rexistraron cun dominio de correo electrónico que coincida exactamente con algún da lista engadiranse automaticamente a este grupo:"
@@ -2336,6 +2336,8 @@ gl:
           search: "Buscar"
           groups: "Grupos"
           dashboard: "Panel"
+        default_categories:
+          modal_yes: "Si"
       badges:
         title: Insignias
         new_badge: Nova insignia
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 5c02a5c9a0..2bfcec5a12 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -997,14 +997,14 @@ he:
           default_name: "המאמת שלי"
         security_key:
           register: "הרשמה"
-          title: 'מפתחות אבטחה'
+          title: "מפתחות אבטחה"
           add: "רישום מפתח אבטחה"
           default_name: "מפתח אבטחה עיקרי"
           not_allowed_error: "זמן תהליך רישום מפתח האבטחה פג או שבוטל."
           already_added_error: "כבר רשמת את מפתח האבטחה הזה. אין צורך לרשום אותו שוב."
-          edit: 'עריכת מפתח אבטחה'
-          edit_description: 'שם מפתח אבטחה'
-          delete: 'מחיקה'
+          edit: "עריכת מפתח אבטחה"
+          edit_description: "שם מפתח אבטחה"
+          delete: "מחיקה"
       change_about:
         title: "שינוי בנוגע אליי"
         error: "ארעה שגיאה בשינוי ערך זה."
@@ -1031,8 +1031,8 @@ he:
         upload_title: "העלו את התמונה שלכם"
         image_is_not_a_square: "אזהרה: קיצצנו את התמונה שלך; האורך והרוחב לא היו שווים."
       change_profile_background:
-        title: "שינוי רקע פרופיל"
-        instructions: "רקעי הפרופיל ימורכזו ויוצגו ברוחב ברירת מחדל של 850px."
+        title: "כותרת פרופיל"
+        instructions: "כותרות הפרופילים ימורכזו ורוחבן ייקבע ל־1110 פיקסלים כבררת מחדל."
       change_card_background:
         title: "כרטיס הרקע של המשתמש/ת"
         instructions: "תמונות רקע ימורכזו ויוצגו ברוחב ברירת מחדל של 590px."
@@ -1294,6 +1294,9 @@ he:
       title:
         title: "כותרת"
         none: "(ללא)"
+      primary_group:
+        title: "קבוצה ראשית"
+        none: "(ללא)"
       filters:
         all: "הכל"
       stream:
@@ -1648,7 +1651,7 @@ he:
       link_description: "הזן תיאור קישור כאן"
       link_dialog_title: "הזן קישור"
       link_optional_text: "כותרת כרשות"
-      link_url_placeholder: "http://example.com"
+      link_url_placeholder: "יש להדביק כתובת כדי לחפש נושאים"
       quote_title: "ציטוט"
       quote_text: "ציטוט"
       code_title: "טקסט מעוצב"
@@ -2401,6 +2404,11 @@ he:
         image_upload_not_allowed_for_new_user: "סליחה, משתמשים חדשים לא יכולים להעלות תמונות."
         attachment_upload_not_allowed_for_new_user: "סליחה, משתמשים חדשים לא יכולים להעלות קבצים."
         attachment_download_requires_login: "מצטערים, עליכם להיות מחוברים כדי להוריד את הקבצים המצורפים."
+      abandon_edit:
+        confirm: "להתעלם מהשינויים שלך?"
+        no_value: "לא, שמור"
+        no_save_draft: "לא, לשמור טיוטה"
+        yes_value: "כן, להתעלם מהעריכה"
       abandon:
         confirm: "האם אתם רוצים לנטוש את הפוסט שלכם?"
         no_value: "לא, שמור אותו"
@@ -2555,10 +2563,14 @@ he:
       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: "לאפשר גם תגיות אחרות"
+      tag_group_selector_placeholder: "(רשות) קבוצת תגיות"
+      required_tag_group_description: "לדרוש שלנושאים חדשים יהיו תגיות מקבוצת תגיות:"
+      min_tags_from_required_group_label: 'מס׳ תגיות:'
+      required_tag_group_label: "קבוצת תגיות:"
       topic_featured_link_allowed: "אפשרו קישורים מומלצים בקטגוריה זו"
       delete: "מחק קטגוריה"
       create: "קטגוריה חדשה"
@@ -3068,6 +3080,7 @@ he:
         parent_tag_description: "תגיות מקבוצה זו לא ניתנות לשימוש אלא אם תגית ההורה קיימת."
         one_per_topic_label: "הגבלה של תג אחד לכל נושא מקבוצה זו"
         new_name: "קבוצת תגיות חדשה"
+        name_placeholder: "שם קבוצת תגיות"
         save: "שמירה"
         delete: "מחיקה"
         confirm_delete: "להסיר את קבוצת התגיות הזו?"
@@ -3238,8 +3251,8 @@ he:
             publish_read_state: "בהודעות קבוצתית לפרסם את מצב הקריאה של הקבוצה"
           membership:
             automatic: אוטומטי
-            trust_level: דרגת אמון
             trust_levels_title: "דרגת אמון המוענקת אוטומטית למשתמשים כאשר הם נוספים:"
+            effects: אפקטים
             trust_levels_none: "ללא"
             automatic_membership_email_domains: "משתמשים אשר נרשמים עם מארח דוא\"ל שתואם בדיוק לאחד מהרשימה, יוספו באופן אוטומטי לקבוצה זו:"
             automatic_membership_retroactive: "החלת כלל מארח דוא\"ל זהה כדי להוסיף משתמשים רשומים"
@@ -4269,6 +4282,10 @@ he:
           dashboard: "לוח בקרה"
         secret_list:
           invalid_input: "שדות הקלט לא יכולים להישאר ריקים או להכיל תווים של קווים אנכיים."
+        default_categories:
+          modal_description: "מעניין אותך להחיל את השינוי הזה רטרואקטיבית? פעולה זו תשנה את העדפותיהם של %{count} משתמשים קיימים."
+          modal_yes: "כן"
+          modal_no: "לא, להחיל את השינוי מעתה ואילך"
       badges:
         title: עיטורים
         new_badge: עיטור חדש
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 4552cbee44..3d013b62da 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -864,7 +864,7 @@ hu:
         edit: "Szerkesztés"
         security_key:
           register: "Regisztráció"
-          delete: 'Törlés'
+          delete: "Törlés"
       change_about:
         title: "Rólam megváltoztatása"
         error: "Hiba történt az adat módosításakor."
@@ -889,9 +889,6 @@ hu:
         uploaded_avatar_empty: "Egyéni kép hozzáadása"
         upload_title: "Saját kép feltöltése"
         image_is_not_a_square: "Figyelmeztetés: átméreteztük a képét; szélesség és hosszúság nem volt egyforma"
-      change_profile_background:
-        title: "Profil háttérképe"
-        instructions: "A profil háttérképek középre lesznek helyezve, egy alapértelmezett 850px-es szélességgel."
       change_card_background:
         title: "Felhasználói kártya háttérképe"
         instructions: "A háttérképek középre lesznek helyezve, egy alapértelmezett 590px-es szélességgel."
@@ -1107,6 +1104,9 @@ hu:
       title:
         title: "Cím"
         none: "(egyik sem)"
+      primary_group:
+        title: "Elsődleges csoport"
+        none: "(semmi)"
       filters:
         all: "Mind"
       stream:
@@ -1385,7 +1385,6 @@ hu:
       link_description: "itt add meg a link leírását"
       link_dialog_title: "Hiperhivatkozás beszúrása"
       link_optional_text: "alternatív cím"
-      link_url_placeholder: "https://pelda.hu"
       quote_title: "Idézet"
       quote_text: "Idézet"
       code_title: "Előformázott szöveg"
@@ -1869,6 +1868,8 @@ hu:
         image_upload_not_allowed_for_new_user: "Sajnáljuk, de az új felhasználók nem tölthetnek fel képeket!"
         attachment_upload_not_allowed_for_new_user: "Sajnáljuk, de az új felhasználók nem tölthetnek fel csatolmányokat!"
         attachment_download_requires_login: "Sajnáljuk, de be kell jelentkezned, hogy letölthess csatolmányokat!"
+      abandon_edit:
+        no_value: "Nem, megtartás"
       abandon:
         confirm: "Biztosan visszavonod a bejegyzésedet? "
         no_value: "Nem, tartsd meg"
@@ -1953,7 +1954,6 @@ hu:
       settings: "Beállítások"
       topic_template: "Téma sablonja"
       tags: "Címkék"
-      tags_tab_description: "Az itt megadott címkék és címkecsoportok csak ebben a kategóriában és olyan más kategóriákban lesznek elérhetők, amelyek szintén megnevezikazokat. Nem lesznek elérhetők más kategóriákban."
       delete: "Kategória törlése"
       create: "Új kategória"
       save: "Kategória mentése"
@@ -2439,7 +2439,6 @@ hu:
               staff: "Csoport tulajdonosok és a stáb tagjai"
           membership:
             automatic: Autómatikus
-            trust_level: Bizalmi szint
             trust_levels_title: "Új tagok hozzáadásakor automatikusan kapott Bizalmi szint: "
             trust_levels_none: "Egyik sem"
         name_placeholder: "Csoport neve szóközök nélkül, a felhasználónév szabályaival"
@@ -3103,6 +3102,8 @@ hu:
           search: "Keresés"
           groups: "Csoportok"
           dashboard: "Vezérlőpult"
+        default_categories:
+          modal_yes: "Igen"
       badges:
         title: Jelvények
         new_badge: Új jelvény
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index c8cba23c88..59d8c2b194 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -776,7 +776,7 @@ hy:
         edit: "Խմբագրել"
         security_key:
           register: "Գրանցվել"
-          delete: 'Ջնջել'
+          delete: "Ջնջել"
       change_about:
         title: "Փոփոխել Իմ Մասին բաժինը"
         error: "Այս արժեքը փոփոխելիս տեղի է ունեցել սխալ:"
@@ -802,9 +802,6 @@ hy:
         uploaded_avatar_empty: "Ավելացնել անհատական նկար"
         upload_title: "Վերբեռնեք Ձեր նկարը"
         image_is_not_a_square: "Ուշադրություն. մենք կտրել ենք Ձեր նկարը; լայնությունն ու երկարությունը հավասար չէին:"
-      change_profile_background:
-        title: "Պրոֆիլի Ֆոն"
-        instructions: "Պրոֆիլի ֆոները կկենտրոնացվեն և կունենան 850 պքս լռլեյայն լայնություն:"
       change_card_background:
         title: "Օգտատիրոջ Քարտի Ֆոն"
         instructions: "Ֆոնի նկարները կբերվեն կենտրոն և կունենան 590 պքս լռելյայն լայնություն:"
@@ -1038,6 +1035,9 @@ hy:
       title:
         title: "Վերնագիր"
         none: "(ոչ մի)"
+      primary_group:
+        title: "Հիմնական Խումբ"
+        none: "(ոչ մի)"
       filters:
         all: "Բոլորը"
       stream:
@@ -1353,7 +1353,6 @@ hy:
       link_description: "մուտքագրեք հղման նկարագրությունն այստեղ"
       link_dialog_title: "Տեղադրել Հիպերհղումը"
       link_optional_text: "ընտրովի վերնագիր"
-      link_url_placeholder: "https://example.com"
       quote_title: "Մեջբերել"
       quote_text: "Մեջբերել բաժինը"
       code_title: "Ձևաչափված տեքստ"
@@ -2004,6 +2003,8 @@ hy:
         image_upload_not_allowed_for_new_user: "Ներողություն, նոր օգտատերերը չեն կարող վերբեռնել նկարներ:"
         attachment_upload_not_allowed_for_new_user: "Ներողություն, նոր օգտատերերը չեն կարող ֆայլեր կցել:"
         attachment_download_requires_login: "Ներողություն, Դուք պետք է մուտք գործեք՝ կցված ֆայլերը ներբեռնելու համար:"
+      abandon_edit:
+        no_value: "Ոչ, պահել"
       abandon:
         confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք լքել Ձեր գրառումը:"
         no_value: "Ոչ, պահել"
@@ -2138,7 +2139,6 @@ hy:
       topic_template: "Թեմայի Ձևանմուշ"
       tags: "Թեգեր"
       tags_placeholder: "(Ընտրովի) թույլատրված թեգերի ցանկը"
-      tags_tab_description: "Այստեղ սահմանված թեգերը և թեգերի խմբերը հասանելի կլինեն միայն այս կատեգորիայում և այլ կատեգորիաներում, որոնք նույնպես սահմանում են դրանք: Դրանք հասանելի չեն լինի օգտագործման համար այլ կատեգորիաներում:"
       tag_groups_placeholder: "(Ընտրովի) թույլատրված թեգերի խմբերի ցանկը"
       topic_featured_link_allowed: "Թույլատրել հանրահայտ հղումները այս կատեգորիայում"
       delete: "Ջնջել Կատեգորիան"
@@ -2737,7 +2737,6 @@ hy:
               staff: "Խմբի սեփականատերերը և անձնակազմը"
           membership:
             automatic: Ավտոմատ
-            trust_level: Վստահության Մակարդակ
             trust_levels_title: "Վստահության մակարդակը ավտոմատ կերպով շնորհվում է անդամներին ավելացման ժամանակ:"
             trust_levels_none: "Ոչ մի"
             automatic_membership_email_domains: "Այն օգտատերերը, որոնք գրանցվում են էլ. հասցեի դոմենով, որը ճշգրտորեն համընկնում է այս ցանկում գտնվողին, ավտոմատ կերպով կավելացվեն այս խմբում՝ "
@@ -3703,6 +3702,8 @@ hy:
           dashboard: "Կառավարման վահանակ"
         secret_list:
           invalid_input: "Ներմուծման դաշտերը չեն կարող լինել դատարկ կամ պարունակել ուղղահայաց գիծ ( | ) սիմվոլ:"
+        default_categories:
+          modal_yes: "Այո"
       badges:
         title: Կրծքանշաններ
         new_badge: Նոր Կրծքանշան
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index bc072de8c4..4f8822c2df 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -564,7 +564,7 @@ id:
         show_key_description: "Masukkan secara manual"
         edit: "Ubah"
         security_key:
-          delete: 'Hapus'
+          delete: "Hapus"
       change_about:
         title: "Ganti Tentang Saya"
         error: "Ada kesalahan saat mengganti nilai ini"
@@ -586,9 +586,6 @@ id:
         uploaded_avatar_empty: "Tambah gambar kustom"
         upload_title: "Unggah gambar anda"
         image_is_not_a_square: "Peringatan: kami telah memotong gambar anda; lebar dan tinggi tidak sama."
-      change_profile_background:
-        title: "Latar Belakang Profil"
-        instructions: "Latar belakang profil akan ditengahkan, dan mempunyai lebar standar 850px"
       change_card_background:
         title: "Latar Belakang Kartu Penguna"
         instructions: "Gambar latar belakang akan ditengahkan dan mempunyai lebar standar 590px"
@@ -745,6 +742,8 @@ id:
       title:
         title: "Judul"
         none: "(kosong)"
+      primary_group:
+        none: "(kosong)"
       filters:
         all: "Semua"
       stream:
@@ -1142,7 +1141,6 @@ id:
               staff: "Pemilik kelompok dan staf"
           membership:
             automatic: Otomatis
-            trust_level: Level Kepercayaan
             trust_levels_title: "Tingkat kepercayaan otomatis diberikan kepada anggota ketika mereka ditambahkan:"
             trust_levels_none: "Tidak ada"
         name_placeholder: "Nama grup, tidak boleh menggunakan spasi, sama seperti aturan username"
@@ -1297,6 +1295,8 @@ id:
           email: "Email"
           uncategorized: "Lainnya"
           groups: "Grup"
+        default_categories:
+          modal_yes: "Ya"
       badges:
         new_badge: Badge Baru
         new: Baru
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 42712d12c5..447c309a95 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -872,7 +872,7 @@ it:
         edit: "Modifica"
         security_key:
           register: "Registrare"
-          delete: 'Elimina'
+          delete: "Elimina"
       change_about:
         title: "Modifica i dati personali"
         error: "Si è verificato un errore durante la modifica del valore."
@@ -898,9 +898,6 @@ it:
         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: "Sfondo Profilo"
-        instructions: "Gli sfondi del profilo saranno centrati e avranno per difetto un'ampiezza di 850px."
       change_card_background:
         title: "Sfondo Scheda Utente"
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
@@ -1138,6 +1135,9 @@ it:
       title:
         title: "Titolo"
         none: "(nessuno)"
+      primary_group:
+        title: "Gruppo Primario"
+        none: "(nessuno)"
       filters:
         all: "Tutti"
       stream:
@@ -1465,7 +1465,6 @@ it:
       link_description: "inserisci qui la descrizione del collegamento"
       link_dialog_title: "Inserisci il collegamento"
       link_optional_text: "titolo opzionale"
-      link_url_placeholder: "https://example.com"
       quote_title: "Citazione"
       quote_text: "Citazione"
       code_title: "Testo preformattato"
@@ -2150,6 +2149,8 @@ it:
         image_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare immagini."
         attachment_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare allegati."
         attachment_download_requires_login: "Spiacenti, devi essere connesso per poter scaricare gli allegati."
+      abandon_edit:
+        no_value: "No, mantieni"
       abandon:
         confirm: "Sicuro di voler abbandonare il tuo messaggio?"
         no_value: "No, mantienilo"
@@ -2288,7 +2289,6 @@ 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 ed i gruppi di Etichette specificati di seguito saranno disponibili solamente 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"
@@ -2904,7 +2904,6 @@ it:
               staff: "Proprietari del gruppo e staff"
           membership:
             automatic: Automatico
-            trust_level: Livello Esperienza
             trust_levels_title: "Livello Esperienza assegnato automaticamente agli utenti quando vengono aggiunti:"
             trust_levels_none: "Nessuno"
             automatic_membership_email_domains: "Gli utenti che si registrano con un dominio email che corrisponde esattamente a uno presente in questa lista, saranno aggiunti automaticamente a questo gruppo:"
@@ -3885,6 +3884,8 @@ it:
           dashboard: "Cruscotto"
         secret_list:
           invalid_input: "I campi di input non possono essere vuoti o contenere il carattere barra verticale."
+        default_categories:
+          modal_yes: "Sì"
       badges:
         title: Distintivi
         new_badge: Nuovo Distintivo
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index b488478714..150f3a8163 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -9,8 +9,8 @@ ja:
   js:
     number:
       format:
-        separator: "。"
-        delimiter: "、"
+        separator: "."
+        delimiter: ","
       human:
         storage_units:
           format: "%n %u"
@@ -78,6 +78,10 @@ ja:
           other: "%{count}時間前"
         x_days:
           other: "%{count}日前"
+        x_months:
+          other: "%{count}ヶ月前"
+        x_years:
+          other: "%{count}年前"
       later:
         x_days:
           other: "%{count}日後"
@@ -201,6 +205,7 @@ ja:
       other: "{{count}}文字"
     related_messages:
       title: "関連メッセージ"
+      see_all: '@%{username}からの<a href="%{path}">全てのメッセージ</a>を見る'
     suggested_topics:
       title: "関連トピック"
       pm_title: "他のメッセージ"
@@ -271,6 +276,8 @@ ja:
     banner:
       close: "バナーを閉じる。"
       edit: "このバナーを編集 >>"
+    pwa:
+      install_banner: "<a href>このデバイスに%{title}をインストール</a>しますか？"
     choose_topic:
       none_found: "トピックが見つかりませんでした。"
       title:
@@ -285,11 +292,15 @@ ja:
       order_by: "順"
       in_reply_to: "こちらへの回答"
       explain:
+        subtotal: "小計"
         total: "合計"
+        trust_level_bonus:
+          name: "トラストレベル"
       claim:
         title: "トピックを要請する"
       unclaim:
         help: "この要請を削除する"
+      awaiting_approval: "承認待ち"
       delete: "削除する"
       settings:
         saved: "保存しました"
@@ -322,6 +333,7 @@ ja:
           other: "{{count}}%無投票"
       topics:
         topic: "トピック"
+        reported_by: "報告者："
         deleted: "[デリートされたトピック]"
         original: "(もとのトピック)"
         details: "詳細"
@@ -770,7 +782,7 @@ ja:
         enforced_notice: "このサイトにアクセスするには2段階認証を有効にする必要があります。"
         edit: "編集"
         security_key:
-          delete: '削除する'
+          delete: "削除する"
       change_about:
         title: "プロフィールを変更"
         error: "変更中にエラーが発生しました。"
@@ -795,9 +807,6 @@ ja:
         uploaded_avatar_empty: "カスタム画像を追加"
         upload_title: "画像をアップロード"
         image_is_not_a_square: "警告: アップロードされた画像は高さと幅が違うため切り落されました。"
-      change_profile_background:
-        title: "プロフィールの背景画像"
-        instructions: "プロフィールの背景画像は、幅850pxで中央揃えになります"
       change_card_background:
         title: "ユーザーカードの背景画像"
         instructions: "背景画像は、幅590pxで中央揃えになります"
@@ -1011,6 +1020,9 @@ ja:
       title:
         title: "肩書き"
         none: "（なし）"
+      primary_group:
+        title: "プライマリーグループ"
+        none: "（なし）"
       filters:
         all: "すべて"
       stream:
@@ -1203,6 +1215,12 @@ ja:
       default_header_text: 選択...
       no_content: 一致する項目が見つかりませんでした
       filter_placeholder: 検索...
+      filter_placeholder_with_any: 検索 または 新規作成
+      create: "作成:'{{content}}'"
+      max_content_reached:
+        other: "{{count}}アイテムまで選択できます。"
+      min_content_not_reached:
+        other: "少なくとも{{count}}アイテムを選択してください。"
     date_time_picker:
       from: 発信元
       to: 宛先
@@ -1835,6 +1853,8 @@ ja:
         image_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザは画像のアップロードができません。"
         attachment_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザはファイルの添付ができません。"
         attachment_download_requires_login: "ファイルをダウンロードするには、ログインする必要があります"
+      abandon_edit:
+        no_value: "いいえ、保持します"
       abandon:
         confirm: "編集中の投稿は失われてしまいます。本当によろしいですか？"
         no_value: "いいえ"
@@ -2345,6 +2365,7 @@ ja:
         private_messages_short: "メッセージ"
         private_messages_title: "メッセージ"
         mobile_title: "モバイル"
+        uploads: "アップロード"
         backups: "バックアップ"
         traffic_short: "トラフィック"
         traffic: "Application web requests"
@@ -2396,7 +2417,6 @@ ja:
               staff: "グループオーナーとスタッフ"
           membership:
             automatic: 自動
-            trust_level: トラストレベル
             trust_levels_title: "メンバーが追加されたときにメンバーに自動で付与されるトラストレベル："
             trust_levels_none: "なし"
             automatic_membership_email_domains: "このリストにあるものと完全に一致するメー​​ルドメインで登録したユーザーは、自動的にこのグループに追加されます。"
@@ -2487,7 +2507,9 @@ ja:
           label: "アップロード"
           title: "このインスタンスにバックアップをアップロード"
           uploading: "アップロード中..."
-          error: "ファイル '{{filename}}'アップロードエラー: {{message}}"
+          uploading_progress: "アップロード中... {{progress}}%"
+          success: "'{{filename}}'のアップロードに成功しました。このファイルは現在処理中で、リストに表示されるまでに最大数分程度かかることがあります。"
+          error: "ファイル '{{filename}}'のアップロード中にエラーが発生しました: {{message}}"
         operations:
           is_running: "バックアップ作業を実行中..."
           failed: "{{operation}}失敗しました。ログをチェックください。"
@@ -2499,6 +2521,7 @@ ja:
             label: "バックアップ"
             title: "バックアップを行います"
             confirm: "新しくバックアップを行ってもよろしいですか？"
+            without_uploads: "はい（アップロードデータを含めない）"
           download:
             label: "ダウンロード"
             title: "ダウンロードリンクをメールで送る"
@@ -2560,6 +2583,7 @@ ja:
           settings: "設定"
           preview: "プレビュー"
           collapse: 折りたたむ
+          uploads: "アップロード"
           upload: "アップロード"
           installed: "インストール済み"
           install_popular: "人気"
@@ -3052,6 +3076,8 @@ ja:
           search: "検索"
           groups: "グループ"
           dashboard: "ダッシュボード"
+        default_categories:
+          modal_yes: "はい"
       badges:
         title: バッジ
         new_badge: 新しいバッジ
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 7d1afdb579..69a1b1202d 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -737,7 +737,7 @@ ko:
         edit: "수정"
         security_key:
           register: "등록하기"
-          delete: '삭제'
+          delete: "삭제"
       change_about:
         title: "내 소개 변경"
         error: "값을 바꾸는 중 에러가 발생했습니다."
@@ -762,9 +762,6 @@ ko:
         uploaded_avatar_empty: "커스텀 사진 추가"
         upload_title: "프로필 사진 업로드"
         image_is_not_a_square: "경고: 정사각형 이미지가 아니기 때문에 사진을 수정하였습니다."
-      change_profile_background:
-        title: "프로필 배경"
-        instructions: "프로필 배경은 가운데를 기준으로 표시되며 850px이 기본 가로 사이즈 입니다."
       change_card_background:
         title: "사용자 카드 배경"
         instructions: "배경 이미지는 가운데를 기준으로 표시되며 590px이 기본 가로 사이즈 입니다."
@@ -966,6 +963,9 @@ ko:
       title:
         title: "호칭"
         none: "(없음)"
+      primary_group:
+        title: "주 그룹"
+        none: "(없음)"
       filters:
         all: "전체"
       stream:
@@ -1224,7 +1224,6 @@ ko:
       link_description: "링크 설명을 입력"
       link_dialog_title: "하이퍼링크 삽입"
       link_optional_text: "옵션 제목"
-      link_url_placeholder: "https://example.com"
       quote_title: "인용구"
       quote_text: "인용구"
       code_title: "코드 샘플"
@@ -1770,6 +1769,8 @@ ko:
         image_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 이미지를 업로드 하실 수 없습니다."
         attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다."
         attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다."
+      abandon_edit:
+        no_value: "아니요, 버리지 않습니다."
       abandon:
         confirm: "글 작성을 취소 하시겠습니까?"
         no_value: "아니오"
@@ -2405,7 +2406,6 @@ ko:
               staff: "그룹 소유자와 운영진"
           membership:
             automatic: 자동
-            trust_level: 신뢰도
             trust_levels_title: "멤버들이 추가되면 회원등급이 자동으로 부여됩니다:"
             trust_levels_none: "없음"
             automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이 등록한 이메일 도메인이 일치할때 이 그룹에 포함"
@@ -3237,6 +3237,8 @@ ko:
           dashboard: "대시보드"
         secret_list:
           invalid_input: "입력 필드는 비어 있거나 수직 막대 문자를 포함 할 수 없습니다."
+        default_categories:
+          modal_yes: "네"
       badges:
         title: 배지
         new_badge: 새 배지
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index fb9d5d388e..6e3419fedd 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -738,7 +738,7 @@ lt:
         edit: "Redaguoti"
         security_key:
           register: "Registruokis"
-          delete: 'Pašalinti'
+          delete: "Pašalinti"
       change_about:
         title: "Keisti Apie Mane"
         error: "Rasta klaida bandant pakeisti reikšmę. Prašom patikslinti veiksmus."
@@ -761,9 +761,6 @@ lt:
         uploaded_avatar_empty: "Pridėti paveiksliuką"
         upload_title: "Įkelti savo nuotrauką"
         image_is_not_a_square: "Įspėjimas: jūs ką tik apkirpote nuotrauką, tačiau plotis ir ilgis nėra vienodi."
-      change_profile_background:
-        title: "Profilio fonas"
-        instructions: "Profilio fonas bus išcentruotas ir turės numatytą 850px plotį."
       change_card_background:
         title: "Paskyros fonas"
         instructions: "Fono paveiksliukas bus sucentruotas ir turės numatytą 590px plotį."
@@ -946,6 +943,9 @@ lt:
       title:
         title: "Antraštė"
         none: "(nieko)"
+      primary_group:
+        title: "Pagrindinė Grupė"
+        none: "(nieko)"
       filters:
         all: "Visi"
       stream:
@@ -1776,6 +1776,8 @@ lt:
         image_upload_not_allowed_for_new_user: "Atsiprašome, bet nauji vartotojai negali įkelti nuotraukų."
         attachment_upload_not_allowed_for_new_user: "Atsiprašome, bet nauji vartotojai negali įkelti priedų."
         attachment_download_requires_login: "Atsiprašome, bet jūs turite būti prisijungęs, kad galėtumėt atsisiųsti priedus."
+      abandon_edit:
+        no_value: "Ne, palikti"
       abandon:
         confirm: "Ar tikrai norite atšaukti savo įrašą?"
         no_value: "Ne, palikti"
@@ -2393,7 +2395,6 @@ lt:
               staff: "Grupės valdytojai ir moderatoriai"
           membership:
             automatic: Automatini
-            trust_level: Patikimumo lygis
             trust_levels_title: "Pasitikėjimo lygis automatiškai suteikiamas nariui kai jis prideda:"
             trust_levels_none: "Nieko"
             automatic_membership_email_domains: "Vartotojai, kurie užsiregistravo su el. paštu, kuris sutampa su šiame sąraše esančiu el. paštu bus automatiškai pridėti į šią grupę:"
@@ -3065,6 +3066,8 @@ lt:
           search: "Ieškoti"
           groups: "Grupės"
           dashboard: "Apžvalga"
+        default_categories:
+          modal_yes: "Taip"
       badges:
         title: Trofėjai
         new_badge: Naujas ženklelis
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 0b28d1cf28..578aca394b 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -649,7 +649,7 @@ lv:
         name: "Vārds"
         edit: "Labot"
         security_key:
-          delete: 'Dzēst'
+          delete: "Dzēst"
       change_about:
         title: "Mainīt aprakstu par mani"
         error: "Mainot šo vērtību, notika kļūda."
@@ -672,9 +672,6 @@ lv:
         uploaded_avatar_empty: "Pievienot savu attēlu"
         upload_title: "Augšupielādēt savu attēlu"
         image_is_not_a_square: "Uzmanību: mēs apgriezām jūsu attēlu; platums un augstums nebija vienādi."
-      change_profile_background:
-        title: "Profila fons"
-        instructions: "Profila fons būs centrēts un ar noklusējuma platumu 850px."
       change_card_background:
         title: "Lietotāja kartiņas fons"
         instructions: "Fona attēli būs centrēti un ar noklusējuma platumu 590px."
@@ -870,6 +867,9 @@ lv:
       title:
         title: "Virsraksts"
         none: "(neviens)"
+      primary_group:
+        title: "Galvenā grupa"
+        none: "(neviens)"
       filters:
         all: "Visi"
       stream:
@@ -1642,6 +1642,8 @@ lv:
         image_upload_not_allowed_for_new_user: "Atvainojiet, jaunie lietotāji nevar augšuplādēt attēlus."
         attachment_upload_not_allowed_for_new_user: "Atvainojiet, jaunie lietotāji nevar augšuplādēt pielikumus."
         attachment_download_requires_login: "Atvainojiet, jums jābūt ienākušam forumā, lai varētu lejuplādēt pielikumus."
+      abandon_edit:
+        no_value: "Nē, paturēt"
       abandon:
         confirm: "Vai esat drošs, ka vēlaties atteikties no sava ieraksta?"
         no_value: "Nē, paturēt"
@@ -2253,7 +2255,6 @@ lv:
               staff: "Grupu īpašnieki un personāls"
           membership:
             automatic: Automātiski
-            trust_level: Uzticības līmenis
             trust_levels_title: "Uzticamības līmenis, ko automātiski piešķir visiem dalībniekiem pievienošanas brīdī:"
             trust_levels_none: "Nav"
             automatic_membership_email_domains: "Lietotāji, kas reģistrējas ar e-pasta domēnu, kas precīzi sakrīt ar kādu no šī saraksta, tiks automātiski pievienoti šai grupai:"
@@ -2929,6 +2930,8 @@ lv:
           search: "Meklēt"
           groups: "Grupas"
           dashboard: "Administrācijas panelis"
+        default_categories:
+          modal_yes: "Jā"
       badges:
         title: Žetoni
         new_badge: Jauns Žetons
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 0ad211f6fb..8537a20d27 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -759,7 +759,7 @@ nb_NO:
         edit: "Rediger"
         security_key:
           register: "Registrer"
-          delete: 'Slett'
+          delete: "Slett"
       change_about:
         title: "Rediger om meg"
         error: "Det oppstod en feil ved endring av denne verdien."
@@ -784,9 +784,6 @@ nb_NO:
         uploaded_avatar_empty: "Legg til egendefinert bilde"
         upload_title: "Last opp bilde"
         image_is_not_a_square: "Vi har beskåret bildet ditt, høyde og bredde er ikke lik"
-      change_profile_background:
-        title: "Profilbakgrunn"
-        instructions: "Profilbakgrunner vil bli sentrert med en forvalgt bredde på 850 piksler."
       change_card_background:
         title: "Brukerkort bakgrunn"
         instructions: "Bakgrunnsbilder vil bli sentrert og ha en forvalgt bredde på 590 piksler."
@@ -996,6 +993,9 @@ nb_NO:
       title:
         title: "Tittel"
         none: "(ingen)"
+      primary_group:
+        title: "Primærgruppe"
+        none: "(ingen)"
       filters:
         all: "Alle"
       stream:
@@ -1901,6 +1901,8 @@ nb_NO:
         image_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp bilder"
         attachment_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp vedlegg."
         attachment_download_requires_login: "Beklager, du må være innlogget for å laste ned vedlegg."
+      abandon_edit:
+        no_value: "Nei"
       abandon:
         confirm: "Er du sikker på at du vil forlate innlegget ditt?"
         no_value: "Nei"
@@ -2601,7 +2603,6 @@ nb_NO:
               staff: "Gruppeeiere og stab"
           membership:
             automatic: Automatisk
-            trust_level: Tillitsnivå
             trust_levels_title: "Tillitsnivå som automatisk gis til nye medlemmer når de legges til:"
             trust_levels_none: "Ingen"
             automatic_membership_email_domains: "Brukere som registreres med et e-postdomene identisk med et fra denne listen vil automatisk legges til i denne gruppen:"
@@ -3481,6 +3482,8 @@ nb_NO:
           search: "Søk"
           groups: "Grupper"
           dashboard: "Dashbord"
+        default_categories:
+          modal_yes: "Ja"
       badges:
         title: Merker
         new_badge: Nytt merke
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 000d7ffbaf..b3151379da 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -917,14 +917,14 @@ nl:
           default_name: "Mijn authenticator"
         security_key:
           register: "Registreren"
-          title: 'Beveiligingssleutels'
+          title: "Beveiligingssleutels"
           add: "Beveiligingssleutel registreren"
           default_name: "Hoofdbeveiligingssleutel"
           not_allowed_error: "Het registratieproces van de beveiligingssleutel had een time-out of is geannuleerd."
           already_added_error: "U hebt deze beveiligingssleutel al geregistreerd. U hoeft deze niet opnieuw te registreren."
-          edit: 'Beveiligingssleutel bewerken'
-          edit_description: 'Naam van beveiligingssleutel'
-          delete: 'Verwijderen'
+          edit: "Beveiligingssleutel bewerken"
+          edit_description: "Naam van beveiligingssleutel"
+          delete: "Verwijderen"
       change_about:
         title: "Over mij wijzigen"
         error: "Er is een fout opgetreden bij het wijzigen van deze waarde."
@@ -951,8 +951,8 @@ nl:
         upload_title: "Uw afbeelding uploaden"
         image_is_not_a_square: "Waarschuwing: we hebben uw afbeelding bijgesneden; breedte en hoogte waren niet gelijk."
       change_profile_background:
-        title: "Profielachtergrond"
-        instructions: "Profielachtergronden worden gecentreerd en hebben een standaardbreedte van 850px."
+        title: "Profielkoptekst"
+        instructions: "Profielkopteksten worden gecentreerd en hebben een standaardbreedte van 1110px."
       change_card_background:
         title: "Achtergrond van gebruikersprofiel"
         instructions: "Achtergrondafbeeldingen worden gecentreerd en hebben een standaardbreedte van 590px."
@@ -1194,6 +1194,9 @@ nl:
       title:
         title: "Titel"
         none: "(geen)"
+      primary_group:
+        title: "Primaire groep"
+        none: "(geen)"
       filters:
         all: "Alle"
       stream:
@@ -1540,7 +1543,7 @@ nl:
       link_description: "voer hier een omschrijving in"
       link_dialog_title: "Hyperlink invoegen"
       link_optional_text: "optionele titel"
-      link_url_placeholder: "https://example.com"
+      link_url_placeholder: "Plak een URL of typ om topics te zoeken"
       quote_title: "Citaat"
       quote_text: "Citaat"
       code_title: "Vooraf opgemaakte tekst"
@@ -2231,6 +2234,11 @@ nl:
         image_upload_not_allowed_for_new_user: "Sorry, nieuwe gebruikers kunnen geen afbeeldingen uploaden."
         attachment_upload_not_allowed_for_new_user: "Sorry, nieuwe gebruikers kunnen geen bijlagen uploaden."
         attachment_download_requires_login: "Sorry, u dient aangemeld te zijn om bijlagen te downloaden."
+      abandon_edit:
+        confirm: "Weet u zeker dat u uw wijzigingen wilt negeren?"
+        no_value: "Nee, behouden"
+        no_save_draft: "Nee, concept opslaan"
+        yes_value: "Ja, bewerking negeren"
       abandon:
         confirm: "Weet u zeker dat u uw bericht wilt afbreken?"
         no_value: "Nee, behouden"
@@ -2373,10 +2381,14 @@ nl:
       tags_allowed_tags: "Deze tags tot deze categorie beperken:"
       tags_allowed_tag_groups: "Deze tag-groepen tot deze categorie beperken:"
       tags_placeholder: "(Optioneel) lijst van toegestane tags"
-      tags_tab_description: "Hier opgegeven tags en tag-groepen zijn alleen beschikbaar in deze categorie en andere categorieën die ze ook opgeven. Ze zijn niet beschikbaar voor gebruik in andere categorieën."
+      tags_tab_description: "Hierboven opgegeven tags en tag-groepen zijn alleen beschikbaar in deze categorie en andere categorieën die ze ook opgeven. Ze zijn niet beschikbaar voor gebruik in andere categorieën."
       tag_groups_placeholder: "(Optioneel) lijst van toegestane tag-groepen"
       manage_tag_groups_link: "Beheer hier tag-groepen."
       allow_global_tags_label: "Ook andere tags toestaan"
+      tag_group_selector_placeholder: "(Optioneel) Tag-groep"
+      required_tag_group_description: "Nieuwe topics moeten tags hebben uit een tag-groep:"
+      min_tags_from_required_group_label: 'Aantal tags:'
+      required_tag_group_label: "Tag-groep:"
       topic_featured_link_allowed: "Aanbevolen koppelingen in deze categorie toestaan"
       delete: "Categorie verwijderen"
       create: "Nieuwe categorie"
@@ -2842,6 +2854,7 @@ nl:
         parent_tag_description: "Tags uit deze groep kunnen niet worden gebruikt, tenzij de bovenliggende tag actief is."
         one_per_topic_label: "Beperken tot 1 tag per topic uit deze groep"
         new_name: "Nieuwe tag-groep"
+        name_placeholder: "Naam van tag-groep"
         save: "Opslaan"
         delete: "Verwijderen"
         confirm_delete: "Weet u zeker dat u deze tag-groep wilt verwijderen?"
@@ -3010,8 +3023,8 @@ nl:
             publish_read_state: "Bij groepsberichten leesstatus van groep publiceren"
           membership:
             automatic: Automatisch
-            trust_level: Vertrouwensniveau
             trust_levels_title: "Vertrouwensniveau dat automatisch aan nieuwe gebruikers wordt toegekend:"
+            effects: Effecten
             trust_levels_none: "Geen"
             automatic_membership_email_domains: "Gebruikers die zich met een e-maildomein registeren dat precies overeenkomt met een domein in deze lijst worden automatisch aan deze groep toegevoegd:"
             automatic_membership_retroactive: "Dezelfde e-maildomeinregel toepassen voor het toevoegen van bestaande geregistreerde gebruikers"
@@ -4025,6 +4038,10 @@ nl:
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Invoervelden mogen niet leeg zijn of verticale-streeptekens bevatten."
+        default_categories:
+          modal_description: "Wilt u deze wijziging op het verleden toepassen? Hierdoor worden voor %{count} bestaande gebruikers voorkeuren gewijzigd."
+          modal_yes: "Ja"
+          modal_no: "Nee, wijziging alleen vanaf nu toepassen"
       badges:
         title: Badges
         new_badge: Nieuwe badge
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 3571622478..799c1deca8 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -376,27 +376,52 @@ pl_PL:
       in_reply_to: "w odpowiedzi na"
       explain:
         why: "wyjaśnij, dlaczego ten element znalazł się w kolejce"
+        title: "Przeglądalna ocena"
         formula: "Formuła"
+        subtotal: "Suma częściowa"
         total: "Łącznie"
+        min_score_visibility: "Minimalny wynik dla widoczności"
+        score_to_hide: "Wynik do ukrycia postu"
         take_action_bonus:
           name: "Podjęto działanie"
+          title: "Gdy członek personelu zdecyduje się na działanie, flaga otrzymuje premię."
         user_accuracy_bonus:
           name: "celność użytkownika"
+          title: "Użytkownicy, których flagi były wcześniej uzgodnione, otrzymują bonus."
         trust_level_bonus:
           name: "Poziom Zaufania"
+          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"
+      claim_help:
+        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> ."
+      claim:
+        title: "zgłoś ten temat"
+      unclaim:
+        help: "usuń to roszczenie"
       awaiting_approval: "Oczekuje na zatwierdzenie"
       delete: "Usuń"
       settings:
         saved: "Zapisano"
         save_changes: "Zapisz zmiany"
         title: "Ustawienia"
+        priorities:
+          title: "Przeglądalne priorytety"
       moderation_history: "Historia moderacji"
       view_all: "Pokaż wszystko"
       grouped_by_topic: "Grupuj tematycznie"
       none: "Brak elementów do przejrzenia."
       view_pending: "pokaż oczekujące"
+      topic_has_pending:
+        one: "W tym temacie jest <b>%{count}</b> po zatwierdzeniu"
+        few: "W tym temacie jest <b>{{count}}</b> postów oczekujących na zatwierdzenie"
+        many: "W tym temacie jest <b>{{count}}</b> postów oczekujących na zatwierdzenie"
+        other: "W tym temacie jest <b>{{count}}</b> postów oczekujących na zatwierdzenie"
       title: "Sprawdź"
       topic: "Temat:"
+      filtered_topic: "Przefiltrowałeś do przeglądalnej zawartości w jednym temacie."
       filtered_user: "Użytkownik"
       show_all_topics: "pokaż wszystkie tematy"
       deleted_post: "(wpis usunięty)"
@@ -406,6 +431,22 @@ pl_PL:
         email: "Email"
         name: "Imię"
         fields: "Pola"
+      user_percentage:
+        agreed:
+          one: "{{count}}% zgadza się"
+          few: "{{count}}% zgadza się"
+          many: "{{count}}% zgadza się"
+          other: "{{count}}% zgadza się"
+        disagreed:
+          one: "{{count}}% nie zgadza się "
+          few: "{{count}}% nie zgadza się "
+          many: "{{count}}% nie zgadza się "
+          other: "{{count}}% nie zgadza się "
+        ignored:
+          one: "{{count}}% zignorowało"
+          few: "{{count}}% zignorowało"
+          many: "{{count}}% zignorowało"
+          other: "{{count}}% zignorowało"
       topics:
         topic: "Temat"
         reviewable_count: "Liczba"
@@ -418,6 +459,11 @@ pl_PL:
           few: "{{count}} użytkowników"
           many: "{{count}}użytkowników"
           other: "{{count}} użytkowników"
+      replies:
+        one: "%{count} odpowiedź"
+        few: "{{count}} odpowiedzi"
+        many: "{{count}} odpowiedzi"
+        other: "{{count}} odpowiedzi"
       edit: "Edytuj"
       save: "Zapisz"
       cancel: "Anuluj"
@@ -479,6 +525,11 @@ pl_PL:
       approval:
         title: "Wpis wymaga zatwierdzenia"
         description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość."
+        pending_posts:
+          one: "Masz <strong>%{count}</strong> post w toku."
+          few: "Masz oczekujących <strong>{{count}}</strong> postów."
+          many: "Masz oczekujących <strong>{{count}}</strong> postów."
+          other: "Masz oczekujących <strong>{{count}}</strong> postów."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> tworzy <a href='{{topicUrl}}'>temat</a>"
@@ -525,16 +576,19 @@ pl_PL:
         remove_user_as_group_owner: "Usuń prawa właściciela"
     groups:
       member_added: "Dodano"
+      member_requested: "Poproszono o"
       add_members:
         title: "Dodaj członków"
         description: "Zarządzaj członkami tej grupy"
         usernames: "Nazwy użytkowników"
       requests:
+        title: "Prośby"
         reason: "Powód"
         accept: "Zaakceptuj"
         accepted: "przyjęty"
         deny: "Odrzuć"
         denied: "odrzucony"
+        undone: "prośba cofnięta"
       manage:
         title: "Zarządzaj"
         name: "Nazwa"
@@ -624,6 +678,7 @@ pl_PL:
         remove_owner: "Usuń z funkcji właściciela"
         remove_owner_description: "Usuń <b>%{username}</b> z funkcji właściciela tej grupy"
         owner: "Właściciel"
+        forbidden: "Nie możesz oglądać profili użytkowników."
       topics: "Tematy"
       posts: "Wpisów"
       mentions: "Wzmianki"
@@ -705,6 +760,11 @@ pl_PL:
         few: "%{count}nowe tematy w zeszłym tygodniu."
         many: "%{count}nowych tematów w zeszłym tygodniu."
         other: "%{count}nowych tematów w zeszłym tygodniu."
+      topic_stat_sentence_month:
+        one: "%{count} nowy temat w ostatnim miesiącu."
+        few: "%{count} nowe tematy w ostatnim miesiącu."
+        many: "%{count} nowe tematy w ostatnim miesiącu."
+        other: "%{count} nowych tematów w ostatnim miesiącu."
       n_more: "Kategorie (%{count} więcej) …"
     ip_lookup:
       title: Wyszukiwanie adresu IP
@@ -721,6 +781,7 @@ pl_PL:
       topics_entered: "wprowadzone tematy:"
       post_count: "# wpisów"
       confirm_delete_other_accounts: "Czy na pewno chcesz usunąć wybrane konta?"
+      powered_by: "używa <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "skopiowano"
     user_fields:
       none: "(wybierz opcję)"
@@ -779,6 +840,7 @@ pl_PL:
       allow_private_messages: "Pozwól innym użytkownikom wysyłać do mnie prywatne wiadomości"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
+      enable_defer: "Włącz odroczenie, aby oznaczyć tematy jako nieprzeczytane"
       change: "zmień"
       moderator: "{{user}} jest moderatorem"
       admin: "{{user}} jest adminem"
@@ -839,6 +901,7 @@ pl_PL:
       api_last_used_at: "Ostatnio użyto:"
       theme: "Motyw"
       home: "Domyślna strona domowa"
+      staged: "Wystawiany na scenie"
       staff_counters:
         flags_given: "uczynnych oflagowań"
         flagged_posts: "oflagowane wpisy"
@@ -876,35 +939,48 @@ pl_PL:
         choose_new: "Wyberz nowe hasło"
         choose: "Wybierz hasło"
       second_factor_backup:
+        title: "Kod zapasowy weryfikacji dwuskładnikowej"
         regenerate: "Odnów"
         disable: "Wyłącz"
         enable: "Włącz"
         enable_long: "Włącz kody zapasowe"
         copied_to_clipboard: "Skopiowane do schowka"
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka"
+        use: "Używaj kodu zapasowego"
         codes:
           title: "Wygenerowano kody zapasowe"
       second_factor:
         title: "Dwuskładnikowe uwierzytelnianie"
         enable: "Zarządzaj autentykacją dwuetapową"
+        forgot_password: "Zapomniałeś hasła?"
         confirm_password_description: "Potwierdź swoje hasło, aby kontynuować"
         name: "Imię"
         label: "Kod"
         rate_limit: "Poczekaj, zanim spróbujesz użyć innego kodu uwierzytelniającego."
+        enable_description: |
+          Zeskanuj ten kod QR w obsługiwanej aplikacji ( <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> ) i wprowadź kod uwierzytelniający
         disable_description: "Podaj kod uwierzytelniający ze swojej aplikacji"
         show_key_description: "Wpisz ręcznie"
         short_description: |
           Chroń swoje konto za pomocą jednorazowych kodów bezpieczeństwa.
         oauth_enabled_warning: "Pamiętaj, że loginy społecznościowe zostaną wyłączone po włączeniu uwierzytelniania dwuskładnikowego na Twoim koncie."
+        use: "Użyj aplikacji Authenticator"
         enforced_notice: "Aby uzyskać dostęp do tej witryny, musisz włączyć uwierzytelnianie dwuskładnikowe."
         disable: "Wyłącz"
+        disable_title: "Wyłącz drugi czynnik"
         edit: "Edytuj"
         totp:
           title: "Uwierzytelnianie oparte na tokenach"
+          add: "Nowy Authenticator"
+          default_name: "Mój Authenticator"
         security_key:
           register: "Zarejestruj"
-          edit: 'Edytuj Klucz Bezpieczeństwa'
-          delete: 'Usuń'
+          title: "Klucze bezpieczeństwa"
+          add: "Zarejestruj klucz bezpieczeństwa"
+          default_name: "Główny klucz bezpieczeństwa"
+          edit: "Edytuj Klucz Bezpieczeństwa"
+          edit_description: "Nazwa klucza bezpieczeństwa"
+          delete: "Usuń"
       change_about:
         title: "Zmień O mnie"
         error: "Wystąpił błąd podczas zmiany tej wartości."
@@ -929,9 +1005,6 @@ pl_PL:
         uploaded_avatar_empty: "Dodaj zwyczajny obrazek"
         upload_title: "Wyślij swoją grafikę"
         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: "Tło profilu"
-        instructions: "Tła w profilach są wycentrowane i posiadają domyślną szerokość 850px."
       change_card_background:
         title: "Tło karty użytkownika"
         instructions: "Tło karty użytkownika est wycentrowane i posiada domyślną szerokość 590px."
@@ -940,6 +1013,7 @@ pl_PL:
         primary: "Podstawowy adres email"
         secondary: "Drugorzędne adresy email"
         no_secondary: "Brak drugorzędnych adresów email"
+        sso_override_instructions: "E-mail można zaktualizować od dostawcy SSO."
         instructions: "Nie będzie publicznie widoczny."
         ok: "Otrzymasz potwierdzenie emailem"
         invalid: "Podaj poprawny adres email"
@@ -956,7 +1030,9 @@ pl_PL:
         revoke: "Unieważnij"
         cancel: "Anuluj"
         not_connected: "(nie połączony)"
+        confirm_modal_title: "Połącz konto %{provider}"
         confirm_description:
+          account_specific: "Twoje konto %{provider} „%{account_description}” zostanie użyte do uwierzytelnienia."
           generic: "Twoje konto %{provider} zostanie wykorzystane do uwierzytelnienia."
       name:
         title: "Pełna nazwa"
@@ -993,6 +1069,7 @@ pl_PL:
         show_few: "Pokaż mniej"
         was_this_you: "To byłes Ty?"
         was_this_you_description: "Jeśli to nie ty, zalecamy zmianę hasła i wylogowanie się ze wszystkich urządzeń."
+        browser_and_device: "{{browser}} na {{device}}"
         secure_account: "Zabezpiecz moje konto"
         latest_post: "Twój ostatni wpis ..."
       last_posted: "Ostatni wpis"
@@ -1012,6 +1089,7 @@ pl_PL:
         larger: "Większy"
         largest: "Największy"
       title_count_mode:
+        title: "Tytuł strony w tle wyświetla liczbę:"
         notifications: "Nowe powiadomienia"
         contextual: "Nowa zawartość strony"
       like_notification_frequency:
@@ -1036,6 +1114,7 @@ pl_PL:
       email_level:
         title: "Wysyłaj e-mail gdy ktoś mnie cytuje, odpowiada na mój wpis, wywołuje moją @nazwę lub zaprasza mnie do tematu."
         always: "zawsze"
+        only_when_away: "tylko kiedy jest daleko"
         never: "nigdy"
       email_messages_level: "Wyślij e-mail, gdy ktoś napisze mi prywatną wiadomość"
       include_tl0_in_digests: "Dołącz treści od nowych użytkowników w e-mailach podsumowujących."
@@ -1085,6 +1164,9 @@ pl_PL:
         expired: "To zaproszenie wygasło."
         rescind: "Usuń"
         rescinded: "Zaproszenie usunięte"
+        rescind_all: "Usuń wszystkie wygasłe zaproszenia"
+        rescinded_all: "Wszystkie zaproszenia, które wygasły, zostały usunięte!"
+        rescind_all_confirm: "Czy na pewno chcesz usunąć wszystkie wygasłe zaproszenia?"
         reinvite: "Ponów zaproszenie"
         reinvite_all: "Wyślij ponownie wszystkie zaproszenia"
         reinvite_all_confirm: "Jesteś pewny, że chcesz ponownie wysłać wszystkie zaproszenia?"
@@ -1102,6 +1184,7 @@ pl_PL:
           text: "Zaproszenia hurtowe z pliku"
           success: "Plik został przesłany pomyślnie: otrzymasz prywatną wiadomość, gdy proces zostanie zakończony."
           error: "Przykro nam, ale wymagany format pliku to CSV."
+          confirmation_message: "Za chwilę wyślesz zaproszenia do wszystkich w przesłanym pliku."
       password:
         title: "Hasło"
         too_short: "Hasło jest za krótkie."
@@ -1114,6 +1197,7 @@ pl_PL:
         title: "Podsumowanie"
         stats: "Statystyki"
         time_read: "czas odczytu"
+        recent_time_read: "czas ostatniego czytania"
         topic_count:
           one: "utworzono temat"
           few: "utworzono tematów"
@@ -1182,6 +1266,9 @@ pl_PL:
       title:
         title: "Tytuł"
         none: "(brak)"
+      primary_group:
+        title: "Główna grupa"
+        none: "(brak)"
       filters:
         all: "Wszystkie"
       stream:
@@ -1217,6 +1304,9 @@ 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: "Rozpocznijmy <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>dyskusję!</a> Istnieje <strong>%{currentTopics}</strong> tematów i <strong>%{currentPosts}</strong> postów. Goście muszą więcej czytać i odpowiadać - zalecamy przynajmniej <strong>%{requiredTopics}</strong> tematów i <strong>%{requiredPosts}</strong> posty. Tylko pracownicy mogą zobaczyć tę wiadomość."
+    too_few_topics_notice: "Zacznijmy <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>dyskusję!</a> Jest <strong>%{currentTopics}</strong> tematów. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej <strong>%{requiredTopics}</strong> tematów. Tylko pracownicy mogą zobaczyć tę wiadomość."
+    too_few_posts_notice: "Zacznijmy <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>dyskusję!</a> Jest <strong>%{currentPosts}</strong> postów. Odwiedzający potrzebują więcej, aby przeczytać i odpowiedzieć - zalecamy co najmniej <strong>%{requiredPosts}</strong> postów. Tylko pracownicy mogą zobaczyć tę wiadomość."
     learn_more: "dowiedz się więcej…"
     all_time: "łącznie"
     all_time_desc: "łącznie utworzonych tematów"
@@ -1233,6 +1323,8 @@ pl_PL:
     last_post: Opublikowano
     time_read: Przeczytane
     time_read_recently: "%{time_read} częstości"
+    time_read_tooltip: "%{time_read} całkowity czas czytania"
+    time_read_recently_tooltip: "%{time_read} całkowity czytania (%{recent_time_read} w ciągu ostatnich 60 dni)"
     last_reply_lowercase: ostatnia odpowiedź
     replies_lowercase:
       one: odpowiedź
@@ -1261,6 +1353,7 @@ pl_PL:
       title: "Wiadomość"
       invite: "Zaproś innych"
       edit: "Dodaj lub usuń"
+      leave_message: "Czy naprawdę chcesz zostawić tę wiadomość?"
       remove_allowed_user: "Czy naprawdę chcesz usunąć {{name}} z tej dyskusji?"
       remove_allowed_group: "Czy naprawdę chcesz usunąć {{name}} z tej wiadomości?"
     email: "Email"
@@ -1271,6 +1364,7 @@ pl_PL:
     trust_level: "Poziom zaufania"
     search_hint: "nazwa użytkownika, email lub IP"
     create_account:
+      disclaimer: "Rejestrując się, wyrażasz zgodę na <a href='{{privacy_link}}' target='blank'>politykę prywatności</a> i <a href='{{tos_link}}' target='blank'>warunki świadczenia usług</a> ."
       title: "Utwórz konto"
       failed: "Coś poszło nie tak, możliwe, że wybrany adres email jest już zarejestrowany, spróbuj użyć odnośnika przypomnienia hasła"
     forgot_password:
@@ -1288,9 +1382,14 @@ pl_PL:
       button_ok: "OK"
       button_help: "Pomoc"
     email_login:
+      link_label: "Wyślij mi link do logowania"
+      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_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}"
+      logging_in_as: "Logowanie jako %{email}"
       confirm_button: Dokończ logowanie
     login:
       title: "Logowanie"
@@ -1298,7 +1397,13 @@ pl_PL:
       password: "Hasło"
       second_factor_title: "Dwuskładnikowe uwierzytelnianie"
       second_factor_description: "Podaj kod uwierzytelniający ze swojej aplikacji:"
+      second_factor_backup: "Zaloguj się, używając kodu zapasowego"
+      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_alternative: "Nie możesz znaleźć swojego klucza bezpieczeństwa lub chcesz użyć innej metody?"
+      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."
       email_placeholder: "adres email lub nazwa użytkownika"
       caps_lock_warning: "Caps Lock jest włączony"
       error: "Nieznany błąd"
@@ -1342,6 +1447,10 @@ pl_PL:
         title: "przez GitHub"
       discord:
         name: "Discord"
+        title: "z Discordem"
+      second_factor_toggle:
+        totp: "Zamiast tego użyj aplikacji uwierzytelniającej"
+        backup_code: "Zamiast tego użyj kodu zapasowego"
     invites:
       accept_title: "Zaproszenie"
       welcome_to: "Witaj na %{site_name}!"
@@ -1371,12 +1480,16 @@ pl_PL:
       shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
+      enter: "Wejść"
     conditional_loading_section:
       loading: Ładowanie...
+    category_row:
+      topic_count: "{{count}} tematów w tej kategorii"
     select_kit:
       default_header_text: Wybierz...
       no_content: Nie znaleziono dopasowań
       filter_placeholder: Wyszukiwanie...
+      filter_placeholder_with_any: Wyszukaj lub utwórz ...
       create: "Stwórz: '{{content}}'"
       max_content_reached:
         one: "Możesz wybrać tylko jeden element."
@@ -1393,7 +1506,14 @@ pl_PL:
       to: Do
     emoji_picker:
       filter_placeholder: Szukaj emoji
+      smileys_&_emotion: Emotikony i emocje
+      people_&_body: Ludzie i ciało
+      animals_&_nature: Zwierzęta i przyroda
+      food_&_drink: Jedzenie i picie
+      travel_&_places: Podróże i miejsca
+      activities: Zajęcia
       objects: Obiekty
+      symbols: Symbolika
       flags: Flagi
       custom: Spersonalizowane emoji
       recent: Ostatnio używane
@@ -1404,8 +1524,11 @@ pl_PL:
       medium_dark_tone: Średnio ciemny kolor skóry
       dark_tone: Ciemny kolor skóry
     shared_drafts:
+      title: "Udostępnione projekty"
       notice: "Ten temat jest widoczny tylko użytkowników mających dostęp do kategorii <b>{{category}}</b>."
       destination_category: "Kategoria docelowa"
+      publish: "Opublikuj udostępniony projekt"
+      confirm_publish: "Czy na pewno chcesz opublikować ten projekt?"
       publishing: "Publikowanie tematu..."
     composer:
       emoji: "Emoji :)"
@@ -1430,11 +1553,14 @@ pl_PL:
         category: "Wspomniałeś o {{username}} lecz nie zostaną oni powiadomieni ponieważ nie mają dostępu do tej kategorii. Dodaj ich do grupy która ma dostęp do tej kategorii."
         private: "Wspomniałeś o {{username}} lecz nie zostaną powiadomieni ponieważ nie mogą odczytać tej wiadomości . Będziesz musiał ich zaprosić do odczytania tej wiadomości "
       duplicate_link: "Wygląda na to, że Twój link do <b>{{domain}}</b> został już wcześniej przesłany w tym wątku przez <b>@{{username}}</b> w <a href='{{post_url}}'>odpowiedzi przesłanej {{ago}}</a> - jesteś pewien, że chcesz go wysłać ponownie?"
+      reference_topic_title: "Odpowiedz: {{title}}"
       error:
         title_missing: "tytuł jest wymagany"
         title_too_short: "tytuł musi zawierać co najmniej {{min}} znaków"
         title_too_long: "Tytuł nie może zawierać więcej niż {{max}} znaków"
+        post_missing: "Post nie może być pusty"
         post_length: "Wpis musi zawierać przynajmniej {{min}} znaków"
+        try_like: "Czy wypróbowałeś przycisk {{heart}}?"
         category_missing: "Musisz wybrać kategorię"
         tags_missing: "Musisz wybrać co najmniej {{count}} tagów"
       save_edit: "Zapisz zmiany"
@@ -1445,6 +1571,8 @@ pl_PL:
       create_topic: "Utwórz temat"
       create_pm: "Wiadomość"
       create_whisper: "Szept"
+      create_shared_draft: "Utwórz udostępniony projekt"
+      edit_shared_draft: "Edytuj udostępniony projekt"
       title: "Lub naciśnij Ctrl+Enter"
       users_placeholder: "Dodaj osobę"
       title_placeholder: "O czym jest ta dyskusja w jednym zwartym zdaniu. "
@@ -1454,6 +1582,7 @@ pl_PL:
       remove_featured_link: "Usuń link z tematu."
       reply_placeholder: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML. Możesz też przeciągnąć tu obrazek."
       reply_placeholder_no_images: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML."
+      reply_placeholder_choose_category: "Wybierz kategorię przed pisaniem tutaj."
       view_new_post: "Zobacz Twój nowy wpis."
       saving: "Zapisywanie"
       saved: "Zapisano!"
@@ -1472,7 +1601,7 @@ pl_PL:
       link_description: "wprowadź tutaj opis odnośnika"
       link_dialog_title: "Wstaw odnośnik"
       link_optional_text: "opcjonalny tytuł"
-      link_url_placeholder: "http://przyklad.pl"
+      link_url_placeholder: "Wklej adres URL lub wpisz, aby wyszukać tematy"
       quote_title: "Cytat"
       quote_text: "Cytat"
       code_title: "Tekst sformatowany"
@@ -1483,6 +1612,7 @@ pl_PL:
       olist_title: "Lista numerowana"
       ulist_title: "Lista wypunktowana"
       list_item: "Element listy"
+      toggle_direction: "Zmień kierunek"
       help: "Pomoc formatowania Markdown"
       modal_ok: "OK"
       modal_cancel: "Anuluj"
@@ -1494,8 +1624,20 @@ pl_PL:
       composer_actions:
         reply: Odpowiedź
         edit: Edycja
+        reply_to_post:
+          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
         reply_as_private_message:
           label: Nowa wiadomość
+          desc: Utwórz nową osobistą wiadomość
+        reply_to_topic:
+          label: Odpowiedz na temat
+          desc: "Odpowiedz na temat, a nie żaden konkretny post"
+        toggle_whisper:
+          label: Przełącz szept
+          desc: Szepty są widoczne tylko dla pracowników
         create_topic:
           label: "Nowy temat"
     notifications:
@@ -1526,6 +1668,11 @@ pl_PL:
         few: "<span>{{username}}, {{username2}} i {{count}} inne osoby</span> {{description}}"
         many: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
         other: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
+      liked_consolidated_description:
+        one: "polubiłem {{count}} twoich postów"
+        few: "polubiłem {{count}} twoich postów"
+        many: "polubiłem {{count}} twoich postów"
+        other: "polubiono {{count}} twoich postów"
       liked_consolidated: "<span>{{username}}</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
@@ -1536,6 +1683,7 @@ pl_PL:
       granted_badge: "Otrzymujesz '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nowy temat</span> {{description}}"
+      membership_request_accepted: "Członkostwo zaakceptowane w „{{group_name}}”"
       group_message_summary:
         one: "masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}"
         few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
@@ -1547,9 +1695,30 @@ pl_PL:
         quoted: '{{username}} cytuje cie w "{{topic}}" - {{site_title}}'
         replied: '{{username}} odpowiada na twój wpis w "{{topic}}" - {{site_title}}'
         posted: '{{username}} pisze w "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} wysłał Ci osobistą wiadomość w „{{topic}}” - {{site_title}}'
         linked: '{{username}} linkuje do twojego wpisu z "{{topic}}" - {{site_title}}'
+        watching_first_post: '{{username}} utworzył nowy temat „{{topic}}” - {{site_title}}'
+        confirm_title: "Powiadomienia włączone - %{site_title}"
+        confirm_body: "Powodzenie! Powiadomienia zostały włączone."
+        custom: "Powiadomienie od {{username}} na %{site_title}"
       titles:
+        replied: "nowa odpowiedź"
+        quoted: "zacytowany"
+        edited: "edytowane"
+        liked: "nowe polubienie"
+        private_message: "nowa prywatna wiadomość"
+        invitee_accepted: "zaproszenie przyjęte"
+        posted: "nowy post"
+        moved_post: "post został przeniesiony"
+        linked: "połączony"
+        granted_badge: "przyznana odznaka"
+        invited_to_topic: "zaproszony do tematu"
+        group_mentioned: "wspomniana grupa"
+        group_message_summary: "nowe wiadomości grupowe"
         watching_first_post: "nowy temat"
+        topic_reminder: "przypomnienie tematu"
+        liked_consolidated: "nowe polubienia"
+        post_approved: "post zatwierdzony"
     upload_selector:
       title: "Dodaj obraz"
       title_with_attachments: "Dodaj obraz lub plik"
@@ -1575,7 +1744,13 @@ pl_PL:
       select_all: "Zaznacz wszystkie"
       clear_all: "Wyczyść wszystkie"
       too_short: "Wyszukiwana fraza jest zbyt krótka."
+      result_count:
+        one: "<span>Wynik</span> <span class='term'>%{count}</span> <span>dla</span> <span class='term'>{{term}}</span>"
+        few: "<span>{{count}}{{plus}} wyniki dla</span> <span class='term'>{{term}}</span>"
+        many: "<span>{{count}}{{plus}} wyniki dla</span> <span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} wyniki dla</span> <span class='term'>{{term}}</span>"
       title: "szukaj tematów, wpisów, użytkowników lub kategorii"
+      full_page_title: "szukaj tematów lub postów"
       no_results: "Brak wyników wyszukiwania"
       no_more_results: "Nie znaleziono więcej wyników."
       searching: "Szukam…"
@@ -1597,6 +1772,8 @@ pl_PL:
         title: Zaawansowane wyszukiwanie
         posted_by:
           label: Wysłane przez
+        in_category:
+          label: Skategoryzowane
         in_group:
           label: W grupie
         with_badge:
@@ -1604,6 +1781,8 @@ pl_PL:
         with_tags:
           label: Otagowane
         filters:
+          label: Zwracaj tylko tematy / posty ...
+          title: Dopasowanie tylko w tytule
           likes: Lubię
           posted: Opublikowałem w
           watching: Obserwuję
@@ -1637,6 +1816,7 @@ pl_PL:
     go_back: "wróć"
     not_logged_in_user: "strona użytkownika z podsumowaniem bieżących działań i ustawień"
     current_user: "idź do swojej strony użytkowanika"
+    view_all: "Pokaż wszystkie"
     topics:
       new_messages_marker: "ostatnia wizyta"
       bulk:
@@ -1707,8 +1887,10 @@ pl_PL:
         title: "Przenieś do skrzynki odbiorczej"
         help: "Przenieś wiadomość z powrotem do skrzynki odbiorczej"
       edit_message:
+        help: "Edytuj pierwszy post wiadomości"
         title: "Edytuj wiadomość"
       defer:
+        help: "Oznacz jako nieprzeczytane"
         title: "Zignoruj"
       list: "Tematy"
       new: "nowy temat"
@@ -1760,6 +1942,10 @@ pl_PL:
       toggle_information: "przełącz szczegóły tematu"
       read_more_in_category: "Chcesz przeczytać więcej? Przeglądaj inne tematy w {{catLink}} lub {{latestLink}}."
       read_more: "Chcesz przeczytać więcej? {{catLink}} lub {{latestLink}}."
+      group_request: "Aby zobaczyć ten temat, musisz poprosić o członkostwo w grupie `{{name}}`"
+      group_join: "Musisz dołączyć do grupy `{{name}}`, aby zobaczyć ten temat"
+      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 {are } other{}} <a href='{basePath}/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przeglądaj inne tematy w {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Przeglądaj wszystkie kategorie
       view_latest_topics: pokaż aktualne tematy
@@ -1783,7 +1969,9 @@ pl_PL:
         next_week: "Następny tydzień"
         two_weeks: "Dwa tygodnie"
         next_month: "Następny miesiąc"
+        two_months: "Dwa miesiące"
         three_months: "Trzy miesiące"
+        four_months: "Cztery miesiące"
         six_months: "Sześć miesięcy"
         one_year: "Jeden rok"
         forever: "Zawsze"
@@ -1812,6 +2000,7 @@ pl_PL:
         auto_publish_to_category: "Wątek zostanie opublikowany w <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Ten watek zostanie automatycznie zamknięty po %{count} minutach od ostatniego wpisu."
         auto_delete: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
+        auto_bump: "Ten temat zostanie automatycznie podbity %{timeLeft}."
         auto_reminder: "Otrzymasz przypomnienie o tym temacie %{timeLeft}."
       auto_close_title: "Ustawienia automatycznego zamykania"
       auto_close_immediate:
@@ -1831,7 +2020,9 @@ pl_PL:
         jump_bottom: "Przejdź na koniec"
         jump_prompt: "skocz do..."
         jump_prompt_of: "%{count} postów"
+        jump_prompt_long: "Skocz do..."
         jump_bottom_with_number: "przeskocz do wpisu %{post_number}"
+        jump_prompt_to_date: "do daty"
         jump_prompt_or: "lub"
         total: w sumie wpisów
         current: obecny wpis
@@ -1893,6 +2084,8 @@ pl_PL:
         visible: "Ustaw jako widoczny"
         reset_read: "Zresetuj przeczytane dane"
         make_public: "Upublicznij temat"
+        make_private: "Utwórz osobistą wiadomość"
+        reset_bump_date: "Zresetuj datę podbicia"
       feature:
         pin: "Przypnij temat"
         unpin: "Odepnij temat"
@@ -1907,6 +2100,7 @@ pl_PL:
         help: "Odepnij ten temat. Przestanie wyświetlać się na początku listy tematów."
       share:
         title: "Udostępnij"
+        extended_title: "Udostępnij link"
         help: "udostępnij odnośnik do tego tematu"
       print:
         title: "Drukuj"
@@ -1915,6 +2109,9 @@ pl_PL:
         title: "Zgłoś"
         help: "zgłoś ten temat, aby zwrócić uwagę moderacji lub wyślij powiadomienie o nim"
         success_message: "Ten temat został pomyślnie zgłoszony."
+      make_public:
+        title: "Konwertuj na temat publiczny"
+        choose_category: "Wybierz kategorię dla tematu publicznego:"
       feature_topic:
         title: "Wyróżnij ten temat"
         pin: "Wyróżnij ten temat przypinając go na górze w kategorii {{categoryLink}} do"
@@ -1984,6 +2181,7 @@ pl_PL:
       move_to:
         title: "Przenieś do"
         action: "przenieś do"
+        error: "Podczas przenoszenia postów wystąpił błąd."
       split_topic:
         title: "Przenieś do nowego tematu"
         action: "przenieś do nowego tematu"
@@ -1999,24 +2197,47 @@ pl_PL:
         title: "Przenieś do Istniejącego Tematu"
         action: "przenieś do istniejącego tematu"
         error: "Wystąpił błąd podczas przenoszenia wpisów do danego tematu."
+        radio_label: "Istniejący temat"
         instructions:
           one: "Wybierz temat, do którego chcesz przenieś ten wpis."
           few: "Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy."
           many: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
           other: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
       move_to_new_message:
+        title: "Przejdź do nowej wiadomości"
+        action: "przejdź do nowej wiadomości"
+        message_title: "Tytuł nowej wiadomości"
         radio_label: "Nowa wiadomość"
         participants: "Uczestnicy"
+        instructions:
+          one: "Za chwilę utworzysz nową wiadomość i zapełnisz ją wybranym postem."
+          few: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>{{count}}</b> ."
+          many: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>{{count}}</b> ."
+          other: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>{{count}}</b> ."
       move_to_existing_message:
+        title: "Przejdź do istniejącej wiadomości"
+        action: "przejdź do istniejącej wiadomości"
+        radio_label: "Istniejąca wiadomość"
         participants: "Uczestnicy"
+        instructions:
+          one: "Wybierz wiadomość, do której chcesz przenieść ten post."
+          few: "Wybierz wiadomość, do której chcesz przenieść te posty <b>{{count}}</b> ."
+          many: "Wybierz wiadomość, do której chcesz przenieść te posty <b>{{count}}</b> ."
+          other: "Wybierz wiadomość, do której chcesz przenieść te posty <b>{{count}}</b> ."
       merge_posts:
         title: "Scal wybrane posty"
         action: "scal wybrane posty"
         error: "Wystąpił błąd podczas łączenia wybranych postów"
       change_owner:
+        title: "Zmiana właściciela"
         action: "zmień właściciela"
         error: "Wystąpił błąd podczas zmiany właściciela wpisów."
         placeholder: "nazwa nowego właściciela"
+        instructions:
+          one: "Wybierz nowego właściciela posta przez <b>@ {{old_user}}</b>"
+          few: "Wybierz nowego właściciela postów {{count}} autorstwa <b>@ {{old_user}}</b>"
+          many: "Wybierz nowego właściciela postów {{count}} autorstwa <b>@ {{old_user}}</b>"
+          other: "Wybierz nowego właściciela postów {{count}} autorstwa <b>@ {{old_user}}</b>"
       change_timestamp:
         title: "zmień znacznik czasu"
         action: "zmień znacznik czasu"
@@ -2034,6 +2255,10 @@ pl_PL:
           title: "Kliknij aby usunąć post z zaznaczenia"
         select_replies:
           label: "wybierz +replies"
+          title: "Dodaj post i wszystkie jego odpowiedzi do wyboru"
+        select_below:
+          label: "wybierz + poniżej"
+          title: "Dodaj post i wszystko po nim do wyboru"
         delete: usuń wybrane
         cancel: anuluj wybieranie
         select_all: zaznacz wszystkie
@@ -2047,6 +2272,7 @@ pl_PL:
       quote_reply: "Cytuj"
       edit_reason: "Powód"
       post_number: "wpis {{number}}"
+      ignored: "Zignorowana treść"
       wiki_last_edited_on: "wiki ostatnio edytowane w"
       last_edited_on: "ostatnia edycja wpisu"
       reply_as_new_topic: "Odpowiedz w nowym temacie"
@@ -2054,17 +2280,23 @@ pl_PL:
       continue_discussion: "Kontynuując dyskusję z {{postLink}}:"
       follow_quote: "idź do cytowanego wpisu"
       show_full: "Pokaż pełny wpis"
+      show_hidden: "Wyświetl ignorowaną treść."
       deleted_by_author:
         one: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzinę, chyba że zostanie oflagowany) "
         few: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godziny, chyba że zostanie oflagowany) "
         many: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) "
         other: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) "
+      collapse: "zawalić się"
       expand_collapse: "rozwiń/zwiń"
+      locked: "członek personelu zablokował edytowanie tego postu"
       gap:
         one: "pokaż %{count} ukrytą odpowiedź"
         few: "pokaż {{count}} ukryte odpowiedzi"
         many: "pokaż {{count}} ukrytych odpowiedzi"
         other: "pokaż {{count}} ukrytych odpowiedzi"
+      notice:
+        new_user: "To pierwszy raz gdy {{user}}coś opublikował - witamy go w naszej społeczności!"
+        returning_user: "Minęło trochę czasu, odkąd widzieliśmy {{user}} - jego ostatni post był {{time}}."
       unread: "Nieprzeczytany wpis"
       has_replies:
         one: "{{count}} odpowiedź"
@@ -2091,9 +2323,13 @@ pl_PL:
         image_upload_not_allowed_for_new_user: "Przepraszamy, ale nowi użytkownicy nie mogą wgrywać obrazów."
         attachment_upload_not_allowed_for_new_user: "Przepraszamy, ale nowi użytkownicy nie mogą wgrywać załączników."
         attachment_download_requires_login: "Przepraszamy, musisz się zalogować, aby pobierać załączniki."
+      abandon_edit:
+        no_value: "Nie, zatrzymaj"
+        no_save_draft: "Nie, zapisz szkic"
       abandon:
         confirm: "Czy na pewno chcesz porzucić ten wpis?"
         no_value: "Nie, pozostaw"
+        no_save_draft: "Nie, zapisz szkic"
         yes_value: "Tak, porzuć"
       via_email: "ten wpis został dodany emailem"
       via_auto_generated_email: "ten post został dodany poprzez automatycznie wygenerowaną wiadomość e-mail"
@@ -2107,6 +2343,7 @@ pl_PL:
         reply: "zacznij tworzyć odpowiedź na ten wpis"
         like: "lajkuj ten wpis"
         has_liked: "lajkujesz ten wpis"
+        read_indicator: "członkowie, którzy czytają ten post"
         undo_like: "wycofaj lajka"
         edit: "edytuj ten wpis"
         edit_action: "Edytuj"
@@ -2117,6 +2354,16 @@ pl_PL:
         share: "udostępnij odnośnik do tego wpisu"
         more: "Więcej"
         delete_replies:
+          direct_replies:
+            one: "Tak i bezpośrednia odpowiedź %{count}"
+            few: "Tak i bezpośrednie odpowiedzi {{count}}"
+            many: "Tak i bezpośrednie odpowiedzi {{count}}"
+            other: "Tak i {{count}} bezpośrednich odpowiedzi"
+          all_replies:
+            one: "Tak i odpowiedź %{count}"
+            few: "Tak i wszystkie odpowiedzi {{count}}"
+            many: "Tak i wszystkie odpowiedzi {{count}}"
+            other: "Tak i wszystkie {{count}} odpowiedzi "
           just_the_post: "Nie, tylko ten post"
         admin: "administracja wpisem (tryb wiki itp)"
         wiki: "Włącz tryb Wiki"
@@ -2128,8 +2375,13 @@ pl_PL:
         change_owner: "Zmiana właściciela"
         grant_badge: "Przyznaj odznakę"
         lock_post: "Zablokuj Wpis"
+        lock_post_description: "nie pozwalaj postującemu edytować tego postu"
         unlock_post: "Odblokuj Wpis"
+        unlock_post_description: "zezwól postującemu na edycję tego postu"
+        delete_topic_disallowed_modal: "Nie masz uprawnień do usunięcia tego tematu. Jeśli naprawdę chcesz go usunąć, prześlij flagę do moderatora wraz z uzasadnieniem."
+        delete_topic_disallowed: "nie masz uprawnień do usunięcia tego tematu"
         delete_topic: "usuń temat"
+        add_post_notice: "Dodaj notatkę personelu"
       actions:
         flag: "Oflaguj"
         defer_flags:
@@ -2277,6 +2529,7 @@ pl_PL:
         options:
           normal: "Normalny"
           ignore: "Ignoruj"
+          low: "Niski"
           high: "Wysoki"
       sort_options:
         default: "domyślny"
@@ -2721,6 +2974,7 @@ pl_PL:
         security_tab: "Bezpieczeństwo"
         reports_tab: "Zgłoszenia"
         report_filter_any: "każdy"
+        disabled: Wyłączony
         too_many_requests: "Wykonałeś tę akcję zbyt wiele razy. Poczekaj, zanim spróbujesz ponownie."
         not_found_error: "Przepraszamy, ten raport nie istnieje."
         reports:
@@ -2771,7 +3025,6 @@ pl_PL:
               staff: "Właściciele grupy i zespół"
           membership:
             automatic: Automatyczne
-            trust_level: Poziom Zaufania
             trust_levels_title: "Domyślny poziom zaufania przyznawany dodawanym użytkownikom:"
             trust_levels_none: "Brak"
             automatic_membership_email_domains: "Użytkownicy rejestrujący się przy pomocy adresu z tej listy zostaną automatycznie przypisani do tej grupy."
@@ -2856,6 +3109,7 @@ pl_PL:
           inactive: "Nieaktywny"
           failed: "Niepowodzenie"
           successful: "Powodzenie "
+          disabled: "Wyłączony"
         events:
           none: "Brak powiązanych wydarzeń."
           redeliver: "Dostarcz ponownie"
@@ -2896,6 +3150,7 @@ pl_PL:
         change_settings: "Zmień ustawienia"
         change_settings_short: "Ustawienia"
         howto: "Jak zainstalować wtyczkę?"
+        official: "Oficjalna wtyczka"
       backups:
         title: "Kopie zapasowe"
         menu:
@@ -2919,6 +3174,8 @@ pl_PL:
           label: "Wyślij"
           title: "Wyślij kopię zapasową do tej instancji"
           uploading: "Wysyłanie…"
+          uploading_progress: "Przesyłanie ... {{progress}}%"
+          success: "Plik „{{filename}}” został pomyślnie przesłany. Plik jest teraz przetwarzany i pojawienie się na liście może potrwać do minuty."
           error: "Podczas przesyłania pliku wystąpił błąd '{{filename}}': {{message}}"
         operations:
           is_running: "Proces jest w trakcie działania…"
@@ -2931,6 +3188,7 @@ pl_PL:
             label: "Kopia zapasowa"
             title: "Wykonaj kopię zapasową"
             confirm: "Czy chcesz wykonać kopię zapasową?"
+            without_uploads: "Tak (nie dołączaj przesyłanych plików)"
           download:
             label: "Pobierz"
             title: "Wyślij email z linkiem do pobrania"
@@ -2947,6 +3205,8 @@ pl_PL:
             label: "Wycofaj"
             title: "Wycofaj bazę danych do poprzedniego poprawnego stanu"
             confirm: "Czy jesteś pewien, że chcesz przywrócić bazę danych do ostatniej działającej wersji ?"
+        location:
+          local: "Lokalne miejsce"
       export_csv:
         success: "Rozpoczęto eksport: otrzymasz wiadomość, gdy proces zostanie zakończony."
         failed: "Eksport zakończył się niepowodzeniem. Sprawdź logi."
@@ -2970,6 +3230,7 @@ pl_PL:
         save: "Zapisz"
         new: "Nowy"
         new_style: "Nowy styl"
+        install: "zainstalować"
         delete: "Usuń"
         color: "Kolor"
         opacity: "Widoczność"
@@ -2988,6 +3249,7 @@ pl_PL:
           revert_confirm: "Czy na pewno chcesz wycofać swoje zmiany?"
         theme:
           theme: "Motyw"
+          browse_themes: "Przeglądaj motywy społeczności"
           customize_desc: "Personalizacja:"
           title: "Motywy"
           create: "Stwórz"
@@ -3012,10 +3274,14 @@ pl_PL:
           color_scheme_select: "Wybierz kolory, jakie mają być użyte w motywie"
           custom_sections: "Spersonalizowane sekcje:"
           theme_components: "Komponenty motywu"
+          convert: "Konwertować"
+          convert_component_tooltip: "Konwertuj ten składnik na motyw"
           inactive_themes: "Nieaktywne motywy:"
+          inactive_components: "Nieużywane komponenty:"
           disabled_component_tooltip: "Ten komponent został wyłączony"
           default_theme_tooltip: "Ten motyw jest domyślnym motywem witryny"
           updates_available_tooltip: "Dostępne są aktualizacje dla tego motywu"
+          and_x_more: "i {{count}} więcej."
           collapse: Zwiń
           uploads: "Pliki"
           no_uploads: "Możesz załadować zasoby do swojego motywu np. fonty lub obrazy"
@@ -3027,12 +3293,14 @@ pl_PL:
           upload: "Plik"
           unsaved_changes_alert: "Nie zapisałeś jeszcze zmian, czy chcesz je odrzucić i przejść dalej?"
           discard: "Odrzuć"
+          stay: "Zostań"
           css_html: "Własny CSS/HTML"
           edit_css_html: "Edytuj CSS/HTML"
           edit_css_html_help: "Nie modyfikowałeś CSS ani HTML"
           delete_upload_confirm: "Czy usunąć ten plik? (CSS motywu może przestać działać!)"
           import_web_tip: "Repozytorium zawierające motyw"
           remote_branch: "Nazwa oddziału (opcjonalnie)"
+          install: "zainstalować"
           installed: "Zainstalowana"
           install_popular: "Popularne"
           install_upload: "Z twojego urządzenia"
@@ -3283,6 +3551,7 @@ pl_PL:
             backup_destroy: "Zniszcz kopię zapasową "
             reviewed_post: "przejrzane posty"
             custom_staff: "spersonalizowana akcja wtyczki"
+            post_approved: "post zatwierdzony"
             post_rejected: "wpis odrzucony"
             change_name: "zmień nazwe"
         screened_emails:
@@ -3383,6 +3652,7 @@ pl_PL:
           suspended: "Zawieszeni"
           silenced: "Wyciszony"
           suspect: "Podejrzani"
+          staged: "Wystawiany na scenie"
         approved: "Zatwierdzam?"
         titles:
           active: "Aktywni użytkownicy"
@@ -3666,6 +3936,8 @@ pl_PL:
           search: "Wyszukaj"
           groups: "Grupy"
           dashboard: "Raporty"
+        default_categories:
+          modal_yes: "Tak"
       badges:
         title: Odznaki
         new_badge: Nowa odznaka
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index d976f7b595..3d85fde9c3 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -764,7 +764,7 @@ pt:
         edit: "Editar"
         security_key:
           register: "Registar"
-          delete: 'Eliminar'
+          delete: "Eliminar"
       change_about:
         title: "Modificar Sobre Mim"
         error: "Ocorreu um erro ao modificar este valor."
@@ -790,9 +790,6 @@ pt:
         uploaded_avatar_empty: "Adicionar foto personalizada"
         upload_title: "Carregar a sua foto"
         image_is_not_a_square: "Alerta: cortámos a sua imagem; o comprimento e a altura não eram iguais."
-      change_profile_background:
-        title: "Fundo de Perfil"
-        instructions: "O fundo do perfil será centrado e terá por defeito uma largura de 850px."
       change_card_background:
         title: "Fundo do cartão de utilizador"
         instructions: "As imagens de fundo serão centradas e terão por defeito uma largura de 590px."
@@ -1024,6 +1021,9 @@ pt:
       title:
         title: "Título"
         none: "(nenhum)"
+      primary_group:
+        title: "Grupo Primário"
+        none: "(nenhum)"
       filters:
         all: "Todos"
       stream:
@@ -1334,7 +1334,6 @@ pt:
       link_description: "insira aqui a descrição da hiperligação"
       link_dialog_title: "Inserir Hiperligação"
       link_optional_text: "título opcional"
-      link_url_placeholder: "https://exemplo.com"
       quote_title: "Bloco de Citação"
       quote_text: "Bloco de Citação"
       code_title: "Texto pré-formatado"
@@ -1960,6 +1959,8 @@ pt:
         image_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar imagens."
         attachment_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar anexos."
         attachment_download_requires_login: "Desculpe, precisa de iniciar a sessão para transferir anexos."
+      abandon_edit:
+        no_value: "Não, manter"
       abandon:
         confirm: "Tem a certeza que deseja abandonar a sua publicação?"
         no_value: "Não, manter"
@@ -2556,7 +2557,6 @@ pt:
               staff: "Donos do grupo e equipa"
           membership:
             automatic: Automático
-            trust_level: Nível de Confiança
             trust_levels_title: "Nível de confiança concedido automaticamente a membros quando são adicionados:"
             trust_levels_none: "Nenhum"
             automatic_membership_email_domains: "Utilizadores que registem um domínio de email que corresponde exactamente a algum desta lista irão ser automaticamente adicionados a este grupo:"
@@ -3247,6 +3247,8 @@ pt:
           search: "Pesquisar"
           groups: "Grupos"
           dashboard: "Painel de Administração"
+        default_categories:
+          modal_yes: "Sim"
       badges:
         title: Crachás
         new_badge: Novo Crachá
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 8e3e5ba50b..75fbd61682 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -886,7 +886,7 @@ pt_BR:
           default_name: "Meu Autenticador"
         security_key:
           register: "Registro"
-          delete: 'Excluir'
+          delete: "Excluir"
       change_about:
         title: "Modificar Sobre Mim"
         error: "Houve um erro ao alterar este valor."
@@ -912,9 +912,6 @@ pt_BR:
         uploaded_avatar_empty: "Adicionar uma imagem personalizada"
         upload_title: "Enviar sua imagem"
         image_is_not_a_square: "Aviso: nós cortamos a sua imagem; largura e altura não eram iguais."
-      change_profile_background:
-        title: "Plano de Fundo do Perfil"
-        instructions: "Planos de Fundo do perfil serão centralizados e terão uma largura padrão de 850px."
       change_card_background:
         title: "Plano de Fundo do Cartão de Usuário"
         instructions: "Imagens de plano de fundo serão centralizadas e terão uma largura padrão de 590px."
@@ -1156,6 +1153,9 @@ pt_BR:
       title:
         title: "Título"
         none: "(nenhum)"
+      primary_group:
+        title: "Grupo Primário"
+        none: "(nenhum)"
       filters:
         all: "Todos"
       stream:
@@ -1487,7 +1487,6 @@ pt_BR:
       link_description: "digite a descrição do link aqui"
       link_dialog_title: "Inserir Hyperlink"
       link_optional_text: "título opcional"
-      link_url_placeholder: "https://exemplo.com"
       quote_title: "Bloco de Citação"
       quote_text: "Bloco de Citação"
       code_title: "Texto pré-formatado"
@@ -2176,6 +2175,9 @@ pt_BR:
         image_upload_not_allowed_for_new_user: "Desculpe, novos usuário não podem enviar imagens."
         attachment_upload_not_allowed_for_new_user: "Desculpe, usuários novos não podem enviar anexos."
         attachment_download_requires_login: "Desculpe, você precisa estar logado para baixar arquivos anexos."
+      abandon_edit:
+        no_value: "Não, manter."
+        no_save_draft: "Não, salvar rascunho"
       abandon:
         confirm: "Tem certeza que quer abandonar a sua mensagem?"
         no_value: "Não, manter"
@@ -2316,7 +2318,6 @@ pt_BR:
       tags_allowed_tags: "Restringir estas etiquetas a esta categoria:"
       tags_allowed_tag_groups: "Restringir estes grupos de etiquetas a esta categoria:"
       tags_placeholder: "(Opcional) lista de etiquetas permitidas"
-      tags_tab_description: "Etiquetas e grupos de etiquetas especificadas aqui estarão disponíveis apenas nesta categoria e em outras categorias que também as especificam. Elas não estarão disponíveis para uso em outras categorias."
       tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       manage_tag_groups_link: "Gerencie grupos de etiquetas aqui."
       allow_global_tags_label: "Permitir também outras etiquetas"
@@ -2949,7 +2950,6 @@ pt_BR:
               description: "Administradores podem ver todos os grupos."
           membership:
             automatic: Automático
-            trust_level: nível de confiança
             trust_levels_title: "Nível de confiança concedido automaticamente aos membros quando eles são adicionados:"
             trust_levels_none: "Nenhum"
             automatic_membership_email_domains: "Os usuários que se registrarem em um domínio de e-mail que corresponda exatamente a um nesta lista serão adicionados automaticamente a este grupo:"
@@ -3958,6 +3958,8 @@ pt_BR:
           dashboard: "Painel de Controle"
         secret_list:
           invalid_input: "Campos de entrada não podem ser vazios ou conter o caractere de barra vertical."
+        default_categories:
+          modal_yes: "Sim"
       badges:
         title: Emblemas
         new_badge: Novo Emblema
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 1df623cbe3..025dc089bd 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -716,7 +716,7 @@ ro:
         edit: "Editează"
         security_key:
           register: "Înregistrare"
-          delete: 'Șterge'
+          delete: "Șterge"
       change_about:
         title: "Schimbare date personale"
         error: "A apărut o eroare la schimbarea acestei valori."
@@ -741,9 +741,6 @@ ro:
         uploaded_avatar_empty: "Adaugă poza preferată"
         upload_title: "Încarcă poza preferată"
         image_is_not_a_square: "Atenţie: poza este decupată, înălțimea și lățimea nu erau egale."
-      change_profile_background:
-        title: "Fundal pentru pagina de profil"
-        instructions: "Fundalul profilului va fi centrat şi va avea o dimensiune standard de 850px."
       change_card_background:
         title: "Fundal pentru pagina cu date personale"
         instructions: "Fundalul va fi centrat şi va avea o dimensiune standard de 590px."
@@ -952,6 +949,9 @@ ro:
       title:
         title: "Titlu"
         none: "(nimic)"
+      primary_group:
+        title: "Grup primar"
+        none: "(nimic)"
       filters:
         all: "Toate"
       stream:
@@ -1792,6 +1792,8 @@ ro:
         image_upload_not_allowed_for_new_user: "Ne pare rău, un utilizator nou nu poate încărca imagini."
         attachment_upload_not_allowed_for_new_user: "Ne pare rău, un utilizator nou nu poate încărca atașamente."
         attachment_download_requires_login: "Ne pare rău, dar trebuie să fii autentificat pentru a descărca ataşamente."
+      abandon_edit:
+        no_value: "Nu, păstrează."
       abandon:
         confirm: "Ești sigur că dorești să abandonezi postarea?"
         no_value: "Nu, păstrează"
@@ -2446,7 +2448,6 @@ ro:
               staff: "Proprietarii grupului și echipa"
           membership:
             automatic: Automat
-            trust_level: Nivel de încredere
             trust_levels_title: "Nivel de încredere acordat automat membrilor atunci când sunt adăugați:"
             trust_levels_none: "Nimeni"
             automatic_membership_email_domains: "Utilizatorii care se înregistrează cu un domeniu de email identic cu unul din lista asta vor fi adăugați automat în acest grup:"
@@ -3213,6 +3214,8 @@ ro:
           search: "Căutare"
           groups: "Grupuri"
           dashboard: "Panou de control"
+        default_categories:
+          modal_yes: "Da"
       badges:
         title: Ecusoane
         new_badge: Ecuson nou
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 40a7b6fee9..8869a8230e 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -997,14 +997,14 @@ ru:
           default_name: "Мой Аутентификатор"
         security_key:
           register: "Зарегистрироваться"
-          title: 'Ключи безопасности'
+          title: "Ключи безопасности"
           add: "Зарегистрировать ключ безопасности"
           default_name: "Главный Ключ Безопасности"
           not_allowed_error: "Время регистрации ключа безопасности истекло или было отменено."
           already_added_error: "Вы уже зарегистрировали этот ключ безопасности. Вам не нужно регистрировать его снова."
-          edit: 'Изменить Ключ Безопасности'
-          edit_description: 'Имя Ключа Безопасности'
-          delete: 'Удалить'
+          edit: "Изменить Ключ Безопасности"
+          edit_description: "Имя Ключа Безопасности"
+          delete: "Удалить"
       change_about:
         title: "Изменить информацию обо мне"
         error: "При изменении значения произошла ошибка."
@@ -1030,9 +1030,6 @@ ru:
         uploaded_avatar_empty: "Добавить собственный аватар"
         upload_title: "Загрузка собственного аватара"
         image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и высота не равны друг другу."
-      change_profile_background:
-        title: "Фон профиля"
-        instructions: "Картинки фона профилей будут отцентрированы и по-умолчанию имеют ширину 850 пикселей."
       change_card_background:
         title: "Фон карточки пользователя"
         instructions: "Картинки фона будут отцентрированы и по-умолчанию имеют ширину 590 пикселей."
@@ -1294,6 +1291,9 @@ ru:
       title:
         title: "Заголовок"
         none: "(нет)"
+      primary_group:
+        title: "Основная группа"
+        none: "(нет)"
       filters:
         all: "Всего"
       stream:
@@ -1648,7 +1648,7 @@ ru:
       link_description: "введите описание ссылки"
       link_dialog_title: "Вставить ссылку"
       link_optional_text: "кликабельный текст ссылки"
-      link_url_placeholder: "https://example.com"
+      link_url_placeholder: "Вставьте URL или введите для поиска темы"
       quote_title: "Цитата"
       quote_text: "Впишите сюда текст цитаты"
       code_title: "Текст \"как есть\" (без применения форматирования)"
@@ -2399,6 +2399,11 @@ ru:
         image_upload_not_allowed_for_new_user: "К сожалению, загрузка изображений недоступна новым пользователям."
         attachment_upload_not_allowed_for_new_user: "К сожалению, загрузка файлов недоступна новым пользователям."
         attachment_download_requires_login: "Войдите, чтобы скачивать прикрепленные файлы."
+      abandon_edit:
+        confirm: "Вы уверены, что хотите отменить свои изменения?"
+        no_value: "Нет, оставить"
+        no_save_draft: "Нет, сохраните черновик"
+        yes_value: "Да, отменить редактирование"
       abandon:
         confirm: "Вы уверены, что хотите отказаться от сообщения?"
         no_value: "Нет, оставить"
@@ -2553,7 +2558,6 @@ ru:
       tags_allowed_tags: "Ограничить эти теги данной категорией:"
       tags_allowed_tag_groups: "Ограничьте эти группы тегов этой категорией:"
       tags_placeholder: "(Необязательно) список доступных тегов"
-      tags_tab_description: "Теги и группы тегов, указанные здесь, будут доступны только в этой категории и других категориях, в которых они также указаны. Они не будут доступны для использования в других категориях."
       tag_groups_placeholder: "(Необязательно) список доступных групп тегов"
       manage_tag_groups_link: "Управлять группами тегов здесь."
       allow_global_tags_label: "Также разрешить другие теги"
@@ -3236,8 +3240,8 @@ ru:
             publish_read_state: "В сообщениях группы публикуют состояние чтения группы"
           membership:
             automatic: Автоматическая
-            trust_level: Уровень Доверия
             trust_levels_title: "Уровень доверия, автоматически присваиваемый участникам при их добавлении:"
+            effects: Эффекты
             trust_levels_none: "Отсутствует"
             automatic_membership_email_domains: "Пользователи, зарегистрированные c адресом электронной почты, который точно совпадает с доменом в этом списке, будут автоматически добавлены в эту группу: "
             automatic_membership_retroactive: "Примените то же правило домена e-mail, чтобы добавить существующих зарегистрированных пользователей."
@@ -3270,6 +3274,8 @@ ru:
         title: "API"
         key: "Ключ API"
         created: Создано
+        last_used: Последнее Использование
+        never_used: (никогда)
         generate: "Сгенерировать"
         regenerate: "Перегенерировать"
         revoke: "Отозвать"
@@ -4265,6 +4271,10 @@ ru:
           dashboard: "Админка"
         secret_list:
           invalid_input: "поля ввода не могут быть пустыми или содержать символ вертикальной черты."
+        default_categories:
+          modal_description: "Хотели бы вы применить это изменение исторически? Это изменит настройки для %{count} существующих пользователей."
+          modal_yes: "Да"
+          modal_no: "Нет, только применить изменения в будущем"
       badges:
         title: Награды
         new_badge: Новая награда
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 72417ef9eb..c69f182e00 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -774,7 +774,7 @@ sk:
           Dvojfaktorové prihlásenie pridáva dodatočné zabezpečenie Vášho účtu prostredníctvom zadávania jednorázových hesiel. Heslá môžu byť generované na <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> a<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> zariadeniach.
         edit: "Upraviť"
         security_key:
-          delete: 'Odstrániť'
+          delete: "Odstrániť"
       change_about:
         title: "Upraviť O mne"
         error: "Nastala chyba pri zmene tejto hodnoty."
@@ -800,9 +800,6 @@ sk:
         uploaded_avatar_empty: "Pridať vlastný obrázok"
         upload_title: "Nahrať váš obrázok"
         image_is_not_a_square: "Upozornenie: váš obrázok sme orezali; mal rozdielnu šírku a výšku"
-      change_profile_background:
-        title: "Pozadie profilu"
-        instructions: "Pozadie profilu bude vystredené a s predvolenou šírkou 850px."
       change_card_background:
         title: "Pozadie karty používateľa"
         instructions: "Obrázky pozadia budú vystredené a s predvolenou šírkou 590px."
@@ -1016,6 +1013,9 @@ sk:
       title:
         title: "Názov"
         none: "(žiadne)"
+      primary_group:
+        title: "Hlavná skupina"
+        none: "(žiadne)"
       filters:
         all: "Všetky"
       stream:
@@ -1761,6 +1761,8 @@ sk:
         image_upload_not_allowed_for_new_user: "Ľutujeme, noví použivatelia nemôžu nahrávať obrázky."
         attachment_upload_not_allowed_for_new_user: "Ľutujeme, noví používatelia nemôžu nahrávať prílohy."
         attachment_download_requires_login: "Ľutujeme, pre stiahnutie príloh musíte byť prihlásený."
+      abandon_edit:
+        no_value: "Nie, ponechať"
       abandon:
         confirm: "Ste si istý, že chcete zahodiť tento príspevok?"
         no_value: "Nie, ponechať."
@@ -2353,7 +2355,6 @@ sk:
               public: "Každý"
           membership:
             automatic: Automaticky
-            trust_level: Stupeň dôvery
             trust_levels_title: "Stupeň dôvery automaticky udelený členom po ich pridaní:"
             trust_levels_none: "Žiadny"
             automatic_membership_email_domains: "Užívatelia, ktorí sa zaregistrovali s emailovou doménou uvedenou v zozname budú automaticky pridaní do tejto skupiny. "
@@ -2993,6 +2994,8 @@ sk:
           search: "Hľadať"
           groups: "Skupiny"
           dashboard: "Ovládací panel"
+        default_categories:
+          modal_yes: "Áno"
       badges:
         title: Odznaky
         new_badge: Nový odznak
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 07b9ed9e8e..7017c65897 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -916,7 +916,7 @@ sl:
         enforced_notice: "Obvezno morate vklopiti preverjanje v dveh korakih za dostop to tega spletnega mesta."
         edit: "Uredi"
         security_key:
-          delete: 'Izbriši'
+          delete: "Izbriši"
       change_about:
         title: "Spremeni O meni"
         error: "Prišlo je do napake pri spreminjanju te vrednosti"
@@ -942,9 +942,6 @@ sl:
         uploaded_avatar_empty: "Dodaj sliko po meri"
         upload_title: "Prenesi svojo sliko"
         image_is_not_a_square: "Opozorilo: obrezali smo vašo sliko; širina in višina nista bili enaki."
-      change_profile_background:
-        title: "Ozadje profila"
-        instructions: "Ozadje profila bo centrirano in imelo širino 850px."
       change_card_background:
         title: "Ozadje kartice uporabnika"
         instructions: "Ozadje kartice bo centrirano in imelo širino 590px."
@@ -1206,6 +1203,9 @@ sl:
       title:
         title: "Naziv"
         none: "(brez)"
+      primary_group:
+        title: "Primarna skupina"
+        none: "(brez)"
       filters:
         all: "Vse"
       stream:
@@ -1540,7 +1540,6 @@ sl:
       link_description: "vnesite opis povezave tukaj"
       link_dialog_title: "Vstavi povezavo"
       link_optional_text: "neobvezen naslov"
-      link_url_placeholder: "https://example.com"
       quote_title: "Citiraj"
       quote_text: "Citirano"
       code_title: "Preformatirano besedilo"
@@ -2290,6 +2289,9 @@ sl:
         image_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morejo nalagati datotek."
         attachment_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morejo nalagati priponk."
         attachment_download_requires_login: "Oprostite, morate biti prijavljeni da lahko prenesete priponke."
+      abandon_edit:
+        no_value: "Ne, obdrži"
+        no_save_draft: "Ne, shranite osnutek"
       abandon:
         confirm: "Ali ste prepričani, da hočete zavreči vaš prispevek?"
         no_value: "Ne, ohrani"
@@ -2444,7 +2446,6 @@ sl:
       tags_allowed_tags: "Omeji te oznake na to kategorijo:"
       tags_allowed_tag_groups: "Omeji te skupine oznak na to kategorijo:"
       tags_placeholder: "(neobvezno) seznam dovoljenih oznak"
-      tags_tab_description: "Oznake in skupine oznak navedene tukaj bodo na voljo samo v tej kategoriji in drugih kategorijah, ki jih bodo imele navedene. Ne bodo na voljo v ostalih kategorijah."
       tag_groups_placeholder: "(neobvezno) seznam dovoljenih oznak skupin"
       manage_tag_groups_link: "Upravljaj skupine oznak tukaj."
       allow_global_tags_label: "Dovoli tudi druge oznake"
@@ -3109,7 +3110,6 @@ sl:
               staff: "Skrbniki skupine in osebje foruma"
           membership:
             automatic: Samodejno
-            trust_level: Nivo zaupanja
             trust_levels_title: "Stopnja zaupanja, ki je samodejno dodeljena članom, ko so dodani:"
             trust_levels_none: "Brez"
             automatic_membership_email_domains: "Uporabniki, ki se prijavijo z e-naslovom, ki se točno ujema s to domeno, bodo samodejno dodani v to skupino:"
@@ -3204,6 +3204,7 @@ sl:
             label: "Varnostna kopija"
             title: "Ustvari varnostno kopijo"
             confirm: "Želite ustvariti varnostno kopijo?"
+            without_uploads: "Da (brez naloženih datotek)"
           download:
             label: "Naloži"
         location:
@@ -3723,6 +3724,8 @@ sl:
           search: "Išči"
           groups: "Skupine"
           dashboard: "Nadzorna plošča"
+        default_categories:
+          modal_yes: "Da"
       badges:
         title: Značke
         new_badge: Nova značka
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index ac74d9ac9b..62fec31079 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -574,7 +574,7 @@ sq:
         name: "Emri"
         edit: "Redakto"
         security_key:
-          delete: 'Fshij'
+          delete: "Fshij"
       change_about:
         title: "Ndrysho Rreth meje"
         error: "Pati një gabim gjatë ndryshimit të kësaj të dhëne."
@@ -598,9 +598,6 @@ sq:
         uploaded_avatar_empty: "Shto një foto të personalizuar"
         upload_title: "Ngarkoni foton tuaj"
         image_is_not_a_square: "Vini re: fotoja juaj është përshtatur, pasi nuk ishte katrore."
-      change_profile_background:
-        title: "Sfondi i profilit"
-        instructions: "Sfondi i profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 850px."
       change_card_background:
         title: "Sfondi për skedën e anëtarit"
         instructions: "Sfondi do të vendoset në qendër dhe do të ketë një gjerësi prej 590px."
@@ -785,6 +782,9 @@ sq:
       title:
         title: "Titulli"
         none: "(asnjë)"
+      primary_group:
+        title: "Grupi Parësor"
+        none: "(asnjë)"
       filters:
         all: "Të gjitha"
       stream:
@@ -1437,6 +1437,8 @@ sq:
         image_upload_not_allowed_for_new_user: "Na vjen keq, anëtarët e rinj nuk mund të ngarkojnë skedarë. "
         attachment_upload_not_allowed_for_new_user: "Na vjen keq, anëtarët e rinj nuk mund të ngarkojnë skedarë. "
         attachment_download_requires_login: "Na vjen keq, duhet të identifikoheni për të shkarkuar një dokument. "
+      abandon_edit:
+        no_value: "Jo, mbaji"
       abandon:
         confirm: "A jeni të sigurtë se do të braktisni postimin?"
         no_value: "Jo, mbaji"
@@ -1999,7 +2001,6 @@ sq:
               public: "Të gjithë"
           membership:
             automatic: Automatik
-            trust_level: Niveli i besimit
             trust_levels_title: "Niveli i besimit që ju akordohet automatikisht anëtarëve të grupit:"
             trust_levels_none: "Asnjë"
             automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
@@ -2612,6 +2613,8 @@ sq:
           search: "Kërko"
           groups: "Grupet"
           dashboard: "Paneli i kontrollit"
+        default_categories:
+          modal_yes: "Po"
       badges:
         title: Stemat
         new_badge: Stemë e Re
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 0a95b73b3d..a559ebb30c 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -522,7 +522,7 @@ sr:
         name: "Ime foruma"
         edit: "Izmeni"
         security_key:
-          delete: 'Obriši'
+          delete: "Obriši"
       change_about:
         title: "Promijeni O meni"
       change_username:
@@ -542,9 +542,6 @@ sr:
         uploaded_avatar: "Vaša slika"
         uploaded_avatar_empty: "Dodajte vašu sliku"
         upload_title: "Učitajte vašu sliku"
-      change_profile_background:
-        title: "Pozadina Profila"
-        instructions: "Profilne pozadine će biti centrirane i imati standardnu širinu 850px "
       change_card_background:
         title: "Pozadina Korisničke Kartice"
         instructions: "Pozadinske slike će biti centrirane i imati standardu širinu od 590px."
@@ -721,6 +718,8 @@ sr:
         title: "Profilna Slika"
       title:
         title: "Naslov"
+      primary_group:
+        title: "Primarna Grupa"
       filters:
         all: "Sve"
       stream:
@@ -1220,6 +1219,8 @@ sr:
         image_upload_not_allowed_for_new_user: "Žao nam je, novi korisnici ne mogu učitavati slike."
         attachment_upload_not_allowed_for_new_user: "Žao nam je, novi korisnici ne mogu učitavati priloge."
         attachment_download_requires_login: "Žao nam je, morate biti prijavljeni da biste preuzimali priloge."
+      abandon_edit:
+        no_value: "Ne, zadrži"
       abandon:
         confirm: "Jeste li sigurni da želite odustati od vaše poruke?"
         no_value: "Ne, zadrži"
@@ -1631,7 +1632,6 @@ sr:
               public: "Svi"
           membership:
             automatic: Automatska
-            trust_level: Nivo poverenja
             trust_levels_none: "Ništa"
             automatic_membership_email_domains: "Korisnici koji se registruju sa email domenom koja tačno odgovora jednoj na ovoj listi biće automatski dodani u ovu grupu:"
             automatic_membership_retroactive: "Primeni isto pravilo o email domeni za dodavanje postojećih registrovanih korisnika"
@@ -2146,6 +2146,8 @@ sr:
           plugins: "Dodatci"
           groups: "Grupe"
           dashboard: "Komandna Tabla"
+        default_categories:
+          modal_yes: "Da"
       badges:
         title: Značke
         new_badge: Nova Značka
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 7891c623c5..1386d18fb6 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -625,7 +625,7 @@ sv:
         edit: "Redigera"
         security_key:
           register: "Registrera"
-          delete: 'Radera'
+          delete: "Radera"
       change_about:
         title: "Ändra Om Mig"
         error: "Ett fel inträffade vid ändringen av det här värdet."
@@ -648,9 +648,6 @@ sv:
         uploaded_avatar_empty: "Lägg till en anpassad bild"
         upload_title: "Ladda upp din bild"
         image_is_not_a_square: "Varning: vi beskar din bild; bredden och höjden var inte samma."
-      change_profile_background:
-        title: "Profilbakgrund"
-        instructions: "Bakgrunderna är centrerade och har en förinställd bredd på 850px"
       change_card_background:
         title: "Användarkortets bakgrund"
         instructions: "Bakgrundsbilder kommer att vara centrerade och ha en standardbredd på 590 px."
@@ -839,6 +836,9 @@ sv:
       title:
         title: "Titel"
         none: "(ingen)"
+      primary_group:
+        title: "Primär grupp"
+        none: "(ingen)"
       filters:
         all: "Alla"
       stream:
@@ -1551,6 +1551,8 @@ sv:
         image_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte ladda upp bilder."
         attachment_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte bifoga filer."
         attachment_download_requires_login: "Tyvärr, du måste vara inloggad för att kunna ladda ned bifogade filer."
+      abandon_edit:
+        no_value: "nej, behåll"
       abandon:
         confirm: "Är du säker på att du vill avbryta ditt inlägg?"
         no_value: "nej, behåll"
@@ -2148,7 +2150,6 @@ sv:
               public: "Alla"
           membership:
             automatic: Automatisk
-            trust_level: Förtroendenivå
             trust_levels_title: "Förtroendenivå som automatiskt beviljas användare när de läggs till:"
             trust_levels_none: "Inga"
             automatic_membership_email_domains: "Användare som registrerar sig med en e-post vars domän exakt matchar en domän i den här listan kommer automatiskt att bli tillagd i den här gruppen:"
@@ -2841,6 +2842,8 @@ sv:
           search: "Sök"
           groups: "Grupper"
           dashboard: "Översiktspanel"
+        default_categories:
+          modal_yes: "Ja"
       badges:
         title: Utmärkelser
         new_badge: Ny utmärkelse
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index a46b39be55..9cadf45e6f 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -698,7 +698,7 @@ sw:
         edit: "Hariri"
         security_key:
           register: "Jisajili"
-          delete: 'Futa'
+          delete: "Futa"
       change_about:
         title: "Badilisha Taarifa Zangu"
         error: "Hitilafu imetokea wakati wa kubadilisha namba hii."
@@ -723,9 +723,6 @@ sw:
         uploaded_avatar_empty: "Ongeza picha yako binafsi"
         upload_title: "Pakia picha yako"
         image_is_not_a_square: "Onyo: tumepogoa picha yako; upana na urefu hauko sawa."
-      change_profile_background:
-        title: "Mandharinyuma ya Umbo"
-        instructions: "Mandharinyuma ya Umbo yatakuwa katikati na upana wa 850px."
       change_card_background:
         title: "Upande wa nyuma wa Kadi ya mtumiaji"
         instructions: "Picha za nyuma zitawekwa katikati na zitakuwa na upana wa 590px."
@@ -930,6 +927,9 @@ sw:
       title:
         title: "Kichwa cha Habari"
         none: "(hakuna)"
+      primary_group:
+        title: "Kikundi Msingi"
+        none: "(hakuna)"
       filters:
         all: "Zote"
       stream:
@@ -1805,6 +1805,8 @@ sw:
         image_upload_not_allowed_for_new_user: "Samahani, watumiaji wapya hawawezi kupakia picha."
         attachment_upload_not_allowed_for_new_user: "Samahani, watumiaji wapya hawawezi kupakia viambatanisho."
         attachment_download_requires_login: "Samahani, inabidi uwe umeingia kupakua viambatanisho."
+      abandon_edit:
+        no_value: "Hapana, tunza"
       abandon:
         confirm: "Una uhakika unataka kuacha chapisho lako?"
         no_value: "Hapana, tunza"
@@ -2405,7 +2407,6 @@ sw:
               staff: "Wamiliki wa vikundi na wasaidizi"
           membership:
             automatic: Otomatiki
-            trust_level: Kiwango cha Uaminifu
             trust_levels_title: "Wanachama otomatikali watapata kiwango cha uaminifu wakiongezwa:"
             trust_levels_none: "Hakuna"
             automatic_membership_email_domains: "Watumiaji wanaojiunga kupitia barua pepe zenye kikoa kinacholingana na hichi kwenye orodha hii wataongezwa otomatikali kwenye kikundi hiki:"
@@ -3208,6 +3209,8 @@ sw:
           search: "Tafuta"
           groups: "Vikundi"
           dashboard: "Ubao"
+        default_categories:
+          modal_yes: "Ndiyo"
       badges:
         title: Beji
         new_badge: Beji Mpya
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 5f3216bf50..4e5bd837b0 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -417,7 +417,7 @@ te:
         name: "పేరు"
         edit: "సవరించు"
         security_key:
-          delete: 'తొలగించు'
+          delete: "తొలగించు"
       change_about:
         title: "నా గురించి మార్చు"
       change_username:
@@ -437,9 +437,6 @@ te:
         uploaded_avatar: "అనురూప బొమ్మ"
         uploaded_avatar_empty: "అనురూప బొమ్మను కలపండి"
         upload_title: "మీ బొమ్మను కలపండి"
-      change_profile_background:
-        title: "ప్రవర వెనుతలం"
-        instructions: "ప్రవర వెనుతలాలు కేంద్రీకరించబడతాయి మరియు అప్రమేయ వెడల్పు 850 పిక్సెలు ఉంటాయి."
       change_card_background:
         title: "సభ్య కార్డు వెనుతలం"
         instructions: "వెనుతలం బొమ్మలు కేంద్రీకరించబడతాయి మరియు అప్రమేయ వెడల్పు 590 పిక్సెలు ఉంటాయి."
@@ -550,6 +547,8 @@ te:
         title: "ప్రవర బొమ్మ"
       title:
         title: "శీర్షిక"
+      primary_group:
+        title: "ప్రాథమిక గుంపు"
       filters:
         all: "అన్నీ"
       stream:
@@ -996,6 +995,8 @@ te:
         image_upload_not_allowed_for_new_user: "క్షమించాలి. కొత్త సభ్యులు బొమ్మలు ఎగుమతి చేయలేరు."
         attachment_upload_not_allowed_for_new_user: "క్షమించాలి. కొత్త సభ్యులు జోడింపులు ఎగుమతి చేయలేరు."
         attachment_download_requires_login: "క్షమించాలి. జోడింపులు దిగుమతి చేసుకోవడానికి మీరు లాగిన్ అయి ఉండాలి."
+      abandon_edit:
+        no_value: "లేదు, ఉంచండి"
       abandon:
         confirm: "మీరు నిజంగానే మీ టపాను వదిలేద్దామనుకుంటున్నారా?"
         no_value: "లేదు, ఉంచండి"
@@ -1377,7 +1378,6 @@ te:
               public: "అందరూ"
           membership:
             automatic: స్వీయంగా
-            trust_level: నమ్మకం స్థాయి
             automatic_membership_email_domains: "వినియోగదారుడు ఏ ఈ-మెయిల్ డొమైన్ తో నమోదు చేసుకున్నాడో అది ఖచ్చితంగా ఈ జాబితాలో ఒక దానిని పోలి స్వయంసిధ్ధంగా గ్రూప్ కి కలుస్తాయి:"
             automatic_membership_retroactive: "ఇప్పటికే నమోదిత వినియోగదారులను జోడించడానికి అదే ఇమెయిల్ డొమైన్ రూల్ వర్తిస్తుంది"
         name_placeholder: "గంపు పేరు, జాగా లేకుండా, సభ్యనామం వలె"
@@ -1894,6 +1894,8 @@ te:
           search: "వెతుకు"
           groups: "గుంపులు"
           dashboard: "రంగస్థలం"
+        default_categories:
+          modal_yes: "అవును"
       badges:
         title: బ్యాడ్జీలు
         new_badge: కొత్త బ్యాడ్జీ
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 0d6372af46..7ef92dd008 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -544,7 +544,7 @@ th:
         name: "ชื่อ"
         edit: "แก้ไข"
         security_key:
-          delete: 'ลบ'
+          delete: "ลบ"
       change_about:
         title: "เปลี่ยนข้อมูลเกี่ยวกับฉัน"
         error: "เกิดความผิดพลาดในการแก้ไขค่านี้"
@@ -567,9 +567,6 @@ th:
         uploaded_avatar_empty: "เพิ่มรูปกำหนดเอง"
         upload_title: "อัปโหลดรูปภาพของคุณ"
         image_is_not_a_square: "ระวัง: เราได้ตัวรูปภาพบางส่วนของคุณ; ความยาวและความสูงจะไม่เท่ากัน"
-      change_profile_background:
-        title: "พื้นหลังโปรไฟล์"
-        instructions: "พื้นหลังโปรไฟล์จะถูกจัดให้อยู่กึ่งกลางและมีค่าปริยายของความกว้างเท่ากับ 850 พิกเซล"
       change_card_background:
         title: "พื้นหลังผู้ใช้"
         instructions: "รูปพื้นหลังจะถูกจัดกลางและมีความกว้างมาตราฐานที่ 590px"
@@ -744,6 +741,9 @@ th:
       title:
         title: "ชื่อเรื่อง"
         none: "(ไม่มี)"
+      primary_group:
+        title: "กลุ่มหลัก"
+        none: "(ไม่มี)"
       filters:
         all: "ทั้งหมด"
       stream:
@@ -1233,6 +1233,8 @@ th:
         image_upload_not_allowed_for_new_user: "ขออภัย, ผู้ใช้ใหม่ไม่สามารถอัพโหลดรูปภาพได้"
         attachment_upload_not_allowed_for_new_user: "ขออภัย, ผู้ใช้ใหม่ไม่สามารถอัพโหลดไฟล์แนบได้"
         attachment_download_requires_login: "ขออภัย, คุณต้องเข้าสู่ระบบเพื่อดาวห์โหลดไฟล์แนบ"
+      abandon_edit:
+        no_value: "ไม่ เก็บไว้"
       abandon:
         confirm: "คุณต้องการทิ้งโพสของคุณจริงๆเหรอ?"
         no_value: "ไม่ เก็บไว้"
@@ -1570,7 +1572,6 @@ th:
               public: "ทุกคน"
               staff: "เจ้าของกลุ่ม และผู้ดูแล"
           membership:
-            trust_level: ระดับความไว้ใจ
             trust_levels_title: "ระดับความไว้ใจจะถูกให้ไปยังผู้ใช้โดยอัตโนมัติเมื่อพวกเขาเพิ่ม:"
             trust_levels_none: "ไม่มี"
         name_placeholder: "ชื่อกลุ่ม, ไม่มีเว้นวรรค, ใช้กฎเดียวกับชื่อผู้ใช้"
@@ -1899,6 +1900,8 @@ th:
           search: "ค้นหา"
           groups: "กลุ่ม"
           dashboard: "แดชบอร์ด"
+        default_categories:
+          modal_yes: "ใช่"
       badges:
         new: ใหม่
         name: ชื่อ
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 07e8cd3650..3c44d5fe8a 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -889,7 +889,7 @@ tr_TR:
           default_name: "Benim Doğrulayıcım"
         security_key:
           register: "Kayıt Ol"
-          delete: 'Sil'
+          delete: "Sil"
       change_about:
         title: "\"Hakkımda\"yı Değiştir"
         error: "Bu değeri değiştirirken bir hata oluştu."
@@ -915,9 +915,6 @@ tr_TR:
         uploaded_avatar_empty: "Kişisel bir resim ekle"
         upload_title: "Resmini yükle"
         image_is_not_a_square: "Uyarı: Genişliği ve yüksekliği eşit olmadığı için görseli kesmek durumunda kaldık."
-      change_profile_background:
-        title: "Profil Arkaplanı"
-        instructions: "Profil arkaplanları ortalanacak ve genişliği 850px olacak. "
       change_card_background:
         title: "Kullanıcı Kartı Arkaplanı"
         instructions: "Profil arkaplanları ortalanacak ve genişliği 590px olacak. "
@@ -1159,6 +1156,9 @@ tr_TR:
       title:
         title: "Başlık"
         none: "(hiçbiri)"
+      primary_group:
+        title: "Ana Grup"
+        none: "(hiçbiri)"
       filters:
         all: "Hepsi"
       stream:
@@ -1480,7 +1480,6 @@ tr_TR:
       link_description: "buraya bağlantı açıklamasını gir"
       link_dialog_title: "Hyperlink ekle"
       link_optional_text: "isteğe bağlı başlık"
-      link_url_placeholder: "https://example.com"
       quote_title: "Blok-alıntı"
       quote_text: "Blok-alıntı"
       code_title: "Önceden biçimlendirilmiş yazı"
@@ -2137,6 +2136,9 @@ tr_TR:
         image_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar resim yükleyemez."
         attachment_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar dosya yükleyemez."
         attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için giriş yapman gerekiyor."
+      abandon_edit:
+        no_value: "Hayır, kalsın"
+        no_save_draft: "Hayır, taslağı kaydet"
       abandon:
         confirm: "Gönderinden vazgeçtiğine emin misin?"
         no_value: "Hayır, kalsın"
@@ -2276,7 +2278,6 @@ tr_TR:
       tags_allowed_tags: "Bu etiketleri bu kategoriyle sınırla:"
       tags_allowed_tag_groups: "Bu etiket gruplarını bu kategoriyle sınırla:"
       tags_placeholder: "(Seçmeli) izin verilen etiketlerin listesi"
-      tags_tab_description: "Burada belirtilen etiketler ve etiket grupları yalnızca bu kategoride ve bunları belirten diğer kategorilerde bulunur. Diğer kategorilerde kullanılamazlar."
       tag_groups_placeholder: "(Seçmeli) izin verilen etiket gruplarının listesi"
       manage_tag_groups_link: "Etiket gruplarını burada yönetin."
       allow_global_tags_label: "Diğer etiketlere de izin ver"
@@ -2886,7 +2887,6 @@ tr_TR:
             publish_read_state: "Grup mesajlarında grup okuma durumunu yayınla"
           membership:
             automatic: Otomatik
-            trust_level: Güven Seviyesi
             trust_levels_title: "Güven seviyesi, üyelere -eklendiklerinde- otomatik olarak verilir:"
             trust_levels_none: "Hiçbiri"
             automatic_membership_email_domains: "Listede, e-posta alan adıyla tam olarak eşleşen kayıtlı kullanıcılar, otomatik olarak bu gruba eklenir:"
@@ -3777,6 +3777,8 @@ tr_TR:
           search: "Arama"
           groups: "Gruplar"
           dashboard: "Gösterge Paneli"
+        default_categories:
+          modal_yes: "Evet"
       badges:
         title: Rozetler
         new_badge: Yeni Rozet
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index b45f838b2f..177970d1ae 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -9,34 +9,34 @@ uk:
   js:
     number:
       format:
-        separator: ","
-        delimiter: " "
+        separator: "."
+        delimiter: ","
       human:
         storage_units:
           format: "%n %u"
           units:
             byte:
               one: Байт
-              few: Байтів
+              few: Байта
               many: Байт
-              other: Байт
+              other: Байти
             gb: ГБ
             kb: КБ
             mb: МБ
             tb: ТБ
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "{{number}} тис."
+        millions: "{{number}} млн."
     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: "Do MMMM"
-      long_with_year: "D MMM YYYY HH:mm"
-      long_with_year_no_time: "D MMM YYYY"
+      long_with_year: "D MMM YYYY, HH:mm"
+      long_with_year_no_time: "D MMM, YYYY"
       full_with_year_no_time: "D MMMM YYYY"
-      long_date_with_year: "D MMM 'YY LT"
+      long_date_with_year: "D MMM YY, LT"
       long_date_without_year: "D MMM LT"
       long_date_with_year_without_time: "D MMM 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
@@ -45,55 +45,55 @@ uk:
       tiny:
         half_a_minute: "< 1 хв."
         less_than_x_seconds:
-          one: "< %{count} с."
-          few: "< %{count} с."
-          many: "< %{count} с."
-          other: "< %{count} с."
+          one: "< %{count}с."
+          few: "< %{count}с."
+          many: "< %{count}с."
+          other: "< %{count}с."
         x_seconds:
-          one: "%{count} с."
-          few: "%{count} с."
-          many: "%{count} с."
-          other: "%{count} с."
+          one: "%{count}с."
+          few: "%{count}с."
+          many: "%{count}с."
+          other: "%{count}с."
         less_than_x_minutes:
-          one: "< %{count} хв."
-          few: "< %{count} хв."
-          many: "< %{count} хв."
-          other: "< %{count} хв."
+          one: "< %{count}хв."
+          few: "< %{count}хв."
+          many: "< %{count}хв."
+          other: "< %{count}хв."
         x_minutes:
-          one: "%{count} хв."
-          few: "%{count} хв."
-          many: "%{count} хв."
-          other: "%{count} хв."
+          one: "%{count}хв."
+          few: "%{count}хв."
+          many: "%{count}хв."
+          other: "%{count}хв."
         about_x_hours:
-          one: "%{count} год."
-          few: "%{count} год."
-          many: "%{count} год."
-          other: "%{count} год."
+          one: "%{count}год."
+          few: "%{count}год."
+          many: "%{count}год."
+          other: "%{count}год."
         x_days:
-          one: "%{count} д."
-          few: "%{count} д."
-          many: "%{count} д."
-          other: "%{count} д."
+          one: "%{count}д."
+          few: "%{count}д."
+          many: "%{count}д."
+          other: "%{count}д."
         x_months:
-          one: "%{count} міс."
-          few: "%{count} міс."
-          many: "%{count} міс."
-          other: "%{count} міс."
+          one: "%{count}міс."
+          few: "%{count}міс."
+          many: "%{count}міс."
+          other: "%{count}міс."
         about_x_years:
-          one: "%{count} р."
-          few: "%{count} р."
-          many: "%{count} р."
-          other: "%{count} р."
+          one: "%{count}р."
+          few: "%{count}р."
+          many: "%{count}р."
+          other: "%{count}р."
         over_x_years:
-          one: "> %{count} р."
-          few: "> %{count} р."
-          many: "> %{count} р."
-          other: "> %{count} р."
+          one: "> %{count}р."
+          few: "> %{count}р."
+          many: "> %{count}р."
+          other: "> %{count}р."
         almost_x_years:
-          one: "%{count} р."
-          few: "%{count} р."
-          many: "%{count} р."
-          other: "%{count} р."
+          one: "%{count}р."
+          few: "%{count}р."
+          many: "%{count}р."
+          other: "%{count}р."
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
@@ -115,10 +115,10 @@ uk:
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: "%{count} хвилину тому"
-          few: "%{count} хвилини тому"
-          many: "%{count} хвилин тому"
-          other: "%{count} хвилин тому"
+          one: "%{count} хв. тому"
+          few: "%{count} хв. тому"
+          many: "%{count} хв. тому"
+          other: "%{count} хв. тому"
         x_hours:
           one: "%{count} годину тому"
           few: "%{count} години тому "
@@ -129,6 +129,16 @@ uk:
           few: "%{count} дні тому"
           many: "%{count} днів тому"
           other: "%{count} днів тому"
+        x_months:
+          one: "%{count} міс. тому"
+          few: "%{count} міс. тому"
+          many: "%{count} міс. тому"
+          other: "%{count} міс. тому"
+        x_years:
+          one: "%{count} р тому"
+          few: "%{count} р тому"
+          many: "%{count} р тому"
+          other: "%{count} р тому"
       later:
         x_days:
           one: "%{count} день по тому"
@@ -154,17 +164,17 @@ uk:
       close: "сховати"
       twitter: "Поширити це посилання у Twitter"
       facebook: "Поширити це посилання у Facebook"
-      email: "Надіслати це посилання листом"
+      email: "Надіслати це посилання листом на e-mail"
     action_codes:
       public_topic: "робить цю тему публічною %{when}"
       private_topic: "робить цю тему особистим повідомленням %{when}"
-      split_topic: "розділює цю тему %{when}"
-      invited_user: "запрошує %{who} %{when}"
-      invited_group: "запрошує %{who} %{when}"
-      user_left: "%{who} вилучає себе з цього повідомлення %{when}"
-      removed_user: "вилучає %{who} %{when}"
-      removed_group: "вилучає %{who} %{when}"
-      autobumped: "автоматично наштовхується %{when}"
+      split_topic: "розділив цю тему %{when}"
+      invited_user: "запросив %{who} %{when}"
+      invited_group: "запросив %{who} %{when}"
+      user_left: "%{who} вилучив себе з цього повідомлення %{when}"
+      removed_user: "вилучив %{who} %{when}"
+      removed_group: "вилучив %{who} %{when}"
+      autobumped: "автоматично піднято %{when}"
       autoclosed:
         enabled: "закрито %{when}"
         disabled: "відкрито %{when}"
@@ -190,7 +200,7 @@ uk:
     wizard_required: "Запрошуємо до вашого нового Discourse! Давайте розпочнемо з <a href='%{url}' data-auto-route='true'>майстра налаштування</a> ✨"
     emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано."
     bootstrap_mode_enabled: "Задля спрощення запуску вашого нового сайту, ви зараз у режимі початкового завантаження. Усі нові користувачі отримають рівень довіри 1 й увімкнені щоденні підсумки електронною поштою. Це буде автоматично вимкнено, коли приєднається мінімально потрібна кількість користувачів — %{min_users}."
-    bootstrap_mode_disabled: "Режим початкового завантаження буде вимкнено через 24 години."
+    bootstrap_mode_disabled: "Режим Bootstrap буде вимкнено через 24 години."
     themes:
       default_description: "Промовчання"
       broken_theme_alert: "Ваш сайт може не працювати, тому що оформлення/компонент %{theme} містить помилки. Вимкніть його тут: %{path}."
@@ -201,7 +211,7 @@ uk:
         ap_south_1: "Азія (Мумбай)"
         ap_southeast_1: "Азія (Сингапур)"
         ap_southeast_2: "Азія (Сідней)"
-        ca_central_1: "Канада (Центр)"
+        ca_central_1: "Канада (Центральна)"
         cn_north_1: "Китай (Пекін)"
         cn_northwest_1: "Китай (Нінся)"
         eu_central_1: "ЄС (Франкфурт)"
@@ -210,13 +220,13 @@ uk:
         eu_west_2: "ЄС (Лондон)"
         eu_west_3: "ЄС (Париж)"
         sa_east_1: "Південна Америка (Сан-Паулу)"
-        us_east_1: "Схід США (Пн Вірджинія)"
+        us_east_1: "Схід США (Пн. Вірджинія)"
         us_east_2: "Схід США (Огайо)"
         us_gov_east_1: "AWS GovCloud (схід США)"
         us_gov_west_1: "AWS GovCloud (захід США)"
-        us_west_1: "Захід США (Пн Каліфорнія)"
+        us_west_1: "Захід США (Пн. Каліфорнія)"
         us_west_2: "Захід США (Орегон)"
-    edit: "редагувати назву та категорію цієї теми"
+    edit: "редагувати назву та розділ цієї теми"
     expand: "Розгорнути"
     not_implemented: "Цей функціонал ще не реалізовано, даруйте!"
     no_value: "Ні"
@@ -269,19 +279,19 @@ uk:
       other: "{{count}} символів"
     related_messages:
       title: "Пов'язані повідомлення"
-      see_all: 'Переглянути <a href="%{path}">усі повідомлення</a> від @%{username}…'
+      see_all: 'Переглянути <a href="%{path}">усі дописи </a> від @%{username}…'
     suggested_topics:
-      title: "Пропоновані теми"
-      pm_title: "Пропоновані повідомлення"
+      title: "Схожі теми"
+      pm_title: "Схожі повідомлення"
     about:
-      simple_title: "Про"
-      title: "Про %{title}"
+      simple_title: "Інформація"
+      title: "Інформація про %{title}"
       stats: "Статистика"
       our_admins: "Наші адміни"
       our_moderators: "Наші модератори"
       moderators: "Модератори"
       stat:
-        all_time: "Весь час"
+        all_time: "За весь час"
         last_7_days: "Останні 7"
         last_30_days: "Останні 30"
       like_count: "Вподобання"
@@ -289,11 +299,11 @@ uk:
       post_count: "Дописи"
       user_count: "Користувачі"
       active_user_count: "Активні користувачі"
-      contact: "Зв'язатися з нами"
+      contact: "Контакти"
       contact_info: "У випадку серйозних проблем з цим сайтом, будь ласка, зв'яжіться з нами через %{contact_info}."
     bookmarked:
-      title: "Зробити закладку"
-      clear_bookmarks: "Видалити закладки"
+      title: "Закладки"
+      clear_bookmarks: "Очистити закладки"
       help:
         bookmark: "Натисніть, щоб закласти перший допис у цій темі"
         unbookmark: "Натисніть, щоб видалити усі закладки у цій темі"
@@ -309,11 +319,11 @@ uk:
       new_private_message: "Нова чернетка приватного повідомлення"
       topic_reply: "Чернетка відповіді"
       abandon:
-        confirm: "Ви уже відкрити іншу чернетку у цій темі. Ви впевнені, що хочете покинути її?"
-        yes_value: "Так, облишити"
+        confirm: "Ви уже відкрили іншу чернетку у цій темі. Ви впевнені, що хочете покинути її?"
+        yes_value: "Так, відмовитись"
         no_value: "Ні, зачекайте"
     topic_count_latest:
-      one: "Переглянути {{count}}нову чи оновлену тему"
+      one: "Переглянути {{count}} нову чи оновлену тему"
       few: "Переглянути {{count}} нові чи оновлені теми"
       many: "Переглянути {{count}} нових чи оновлених тем"
       other: "Переглянути {{count}} нових чи оновлених тем"
@@ -342,13 +352,15 @@ uk:
     disable: "Вимкнути"
     continue: "Продовжити"
     undo: "Скасувати"
-    revert: "Відкинути"
+    revert: "Повернути"
     failed: "Помилка"
     switch_to_anon: "Увійти в анонімний режим"
     switch_from_anon: "Полишити анонімний режим"
     banner:
       close: "Прибрати цей банер."
       edit: "Редагувати цей банер >>"
+    pwa:
+      install_banner: "Чи хочете ви <a href> встановити %{title} на цей пристрій?</a>"
     choose_topic:
       none_found: "Не знайдено тем."
       title:
@@ -363,10 +375,25 @@ uk:
       order_by: "Сортувати за"
       in_reply_to: "у відповідь на"
       explain:
+        why: "поясніть, чому цей елемент виявився в черзі"
+        title: "Оцінка"
         formula: "Формула"
+        subtotal: "Проміжний підсумок"
         total: "Всього"
+        min_score_visibility: "Мінімальна Оцінка для видимості"
+        score_to_hide: "Оцінка, щоб приховати повідомлення"
+        take_action_bonus:
+          name: "застосований захід"
+          title: "Коли співробітник вирішує вжити заходів, прапор отримує бонус."
+        user_accuracy_bonus:
+          name: "точність користувача"
+          title: "Користувачі, чиї прапори були історично узгоджені, отримують бонус."
         trust_level_bonus:
           name: "рівень довіри"
+          title: "Перевіряємі елементи, створені користувачами з більш високим рівнем довіри, мають більш високий бал."
+        type_bonus:
+          name: "тип бонуса"
+          title: "Деякі перевіряємі типи можуть бути призначені бонус співробітниками, щоб зробити їх більш пріоритетними."
       claim_help:
         optional: "Ви можете заявити права на цей елемент, щоб інші не могли його переглядати."
         required: "Ви повинні заявити права на елементи, перш ніж ви зможете переглядати їх."
@@ -396,7 +423,7 @@ uk:
         other: "Ця тема має <b>{{count}}</b> дописів, що очікують схвалення"
       title: "Переглянути"
       topic: "Тема:"
-      filtered_topic: "Ви відфільтрували контент до перегляду у єдиній темі."
+      filtered_topic: "Ви відфільтрували контент до перегляду у одній темі."
       filtered_user: "Користувач"
       show_all_topics: "показати усі теми"
       deleted_post: "(допис вилучено)"
@@ -413,7 +440,7 @@ uk:
           many: "{{agreed}}, {{disagreed}}, {{ignored}} (усього {{count}} прапорців)"
           other: "{{agreed}}, {{disagreed}}, {{ignored}} (усього {{count}} прапорців)"
         agreed:
-          one: "{{count}}% згодні"
+          one: "{{count}}% згод"
           few: "{{count}}% згодні"
           many: "{{count}}% згодні"
           other: "{{count}}% згодні"
@@ -430,7 +457,7 @@ uk:
       topics:
         topic: "Тема"
         reviewable_count: "Кількість"
-        reported_by: "Повідомлен"
+        reported_by: "Повідомлень"
         deleted: "[Тему вилучено]"
         original: "(оригінальна тема)"
         details: "деталі"
@@ -460,7 +487,7 @@ uk:
         orders:
           priority: "Пріоритет"
           priority_asc: "Пріоритет (зворотний порядок)"
-          created_at: "Створено"
+          created_at: "Створено в"
           created_at_asc: "Створено (зворотний порядок)"
         priority:
           title: "Мінімальний пріоритет"
@@ -470,7 +497,7 @@ uk:
       conversation:
         view_full: "переглянути усю розмову"
       scores:
-        about: "Цей бал розраховується на основі рівня довіри доповідача, відповідності їхніх попередній скарг та пріоритету елемента, про який було сповіщено."
+        about: "Цей бал розраховується на основі рівня довіри доповідача, відповідності їхніх попередніх скарг та пріоритету елемента, про який було сповіщено."
         score: "Бал"
         date: "Дата"
         type: "Тип"
@@ -512,8 +539,8 @@ uk:
           other: "У вас <strong>{{count}}</strong> дописів очікують схвалення."
         ok: "Гаразд"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> написав(ла) <a href='{{topicUrl}}'>тему</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Ви</a> написали <a href='{{topicUrl}}'>тему</a>"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> створив(ла) <a href='{{topicUrl}}'>тему</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Ви</a> створили <a href='{{topicUrl}}'>тему</a>"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> відповів(ла) на <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Ви</a> відповіли на <a href='{{postUrl}}'>{{post_number}}</a>"
       user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> відповів(ла) на <a href='{{topicUrl}}'>тему</a>"
@@ -528,18 +555,18 @@ uk:
     directory:
       filter_name: "фільтрувати за іменем користувача"
       title: "Користувачі"
-      likes_given: "Віддано"
+      likes_given: "Відправлено"
       likes_received: "Отримано"
       topics_entered: "Переглянуто"
       topics_entered_long: "Тем переглянуто"
-      time_read: "Час прочитання"
+      time_read: "Час читання"
       topic_count: "Теми"
       topic_count_long: "Тем створено"
-      post_count: "Відповіді"
+      post_count: "Відповідей"
       post_count_long: "Відповідей опубліковано"
       no_results: "Нічого не знайдено."
-      days_visited: "Відвідини"
-      days_visited_long: "Днів відвідано"
+      days_visited: "Відвідин"
+      days_visited_long: "Днів відвідин"
       posts_read: "Прочитані"
       posts_read_long: "Повідомлень прочитано"
       total_rows:
@@ -579,7 +606,7 @@ uk:
           title: Профіль
         interaction:
           title: Взаємодія
-          posting: Опублікування
+          posting: Дописів
           notification: Сповіщення
         membership:
           title: Членство
@@ -588,7 +615,7 @@ uk:
           title: "Журнали"
           when: "Коли"
           action: "Дія"
-          acting_user: "Дієвий користувач"
+          acting_user: "Ініціатор"
           target_user: "Цільовий користувач"
           subject: "Тема"
           details: "Деталі"
@@ -600,8 +627,8 @@ uk:
         posts: "Немає дописів від членів цієї групи."
         members: "Немає учасників у цій групі."
         requests: "Немає запитів на членство у цій групі."
-        mentions: "Немає згадок у цій групі."
-        messages: "Немає повідомлень у цій групі."
+        mentions: "Немає згадок про цю групу."
+        messages: "Немає повідомлень для цієї групи."
         topics: "Немає тем від учасників цієї групи."
         logs: "Немає журналів у цій групі."
       add: "Додати"
@@ -636,7 +663,7 @@ uk:
         private: "Приватні"
         public_groups: "Публічні групи"
         automatic_group: Автоматична група
-        close_group: Закрити групу
+        close_group: Закрита група
         my_groups: "Мої групи"
         group_type: "Тип групи"
         is_group_user: "Учасник"
@@ -658,6 +685,7 @@ uk:
         remove_owner: "Вилучити як власника"
         remove_owner_description: "Вилучити <b>%{username}</b> з власників цієї групи"
         owner: "Власник"
+        forbidden: "Ви не можете переглядати учасників."
       topics: "Теми"
       posts: "Дописи"
       mentions: "Згадки"
@@ -690,12 +718,12 @@ uk:
           description: "Ви не будете сповіщені ні про що, що стосується повідомлень у цій групі."
       flair_url: "Зображення Avatar Flair"
       flair_url_placeholder: "(Необов'язково) Посилання зображення або клас Font Awesome"
-      flair_url_description: 'Використовуйте квадратні іконки не менші за 20 на 20 пкс або інконки FontAwesome (прийнятні формати: "fa-icon", "far fa-icon" або "fab fa-icon").'
+      flair_url_description: 'Використовуйте квадратні іконки не менші за 20px на 20px або інконки FontAwesome (прийнятні формати: "fa-icon", "far fa-icon" або "fab fa-icon").'
       flair_bg_color: "Колір тла Avatar Flair"
-      flair_bg_color_placeholder: "(Необов'язково) Значення кольору в hex"
+      flair_bg_color_placeholder: "(Необов'язково) Значення кольору в Hex-код"
       flair_color: "Колір Avatar Flair"
-      flair_color_placeholder: "(Необов'язково) Значення кольору в hex"
-      flair_preview_icon: "Попередній перегляд іконки"
+      flair_color_placeholder: "(Необов'язково) Значення кольору в Hex-код"
+      flair_preview_icon: "Іконка Попередній перегляд"
       flair_preview_image: "Попередній перегляд зображення"
     user_action_groups:
       "1": "Вподобані"
@@ -712,14 +740,14 @@ uk:
       "14": "Очікують"
       "15": "Чернетки"
     categories:
-      all: "усі категорії"
+      all: "усі розділи"
       all_subcategories: "усі"
       no_subcategory: "немає"
-      category: "Категорія"
-      category_list: "Показати список категорій"
+      category: "Розділ"
+      category_list: "Показати список розділів"
       reorder:
-        title: "Перевпорядкувати категорії"
-        title_long: "Перевпорядкувати список категорій"
+        title: "Перевпорядкувати розділів"
+        title_long: "Перевпорядкувати список розділів"
         save: "Зберегти порядок"
         apply_all: "Застосувати"
         position: "Позиція"
@@ -748,7 +776,7 @@ uk:
     ip_lookup:
       title: Пошук IP адреси
       hostname: Ім'я хоста
-      location: Місцеположення
+      location: Місцезнаходження
       location_not_found: (невідомо)
       organisation: Організація
       phone: Телефон
@@ -758,7 +786,7 @@ uk:
       trust_level: "РД"
       read_time: "час читання"
       topics_entered: "створено тем"
-      post_count: "кількість дописів"
+      post_count: "дописів"
       confirm_delete_other_accounts: "Ви впевнені, що хочете видалити цих користувачів?"
       powered_by: "використовується <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "скопійовано"
@@ -788,7 +816,7 @@ uk:
         ignore_option: "Ігноровано"
         ignore_option_title: "Ви не отримуватимете сповіщення, пов'язані з цим користувачем, а всі їхні теми та відповіді буде приховано."
         add_ignored_user: "Додати…"
-        mute_option: "Ігноровано"
+        mute_option: "Знемовлено"
         mute_option_title: "Ви не отримуватимете жодних сповіщень, пов'язаних з цим користувачем."
         normal_option: "Нормальний"
         normal_option_title: "Ви отримаєте сповіщення, коли цей користувач відповість вам, цитуватиме або згадуватиме вас."
@@ -829,7 +857,7 @@ uk:
       admin: "{{user}} є адміном"
       moderator_tooltip: "Цей користувач є модератором"
       admin_tooltip: "Цей користувач є адміністратором"
-      silenced_tooltip: "Цей користувач знемовлений"
+      silenced_tooltip: "Цей користувач відключений"
       suspended_notice: "Цього користувача призупинено до {{date}}."
       suspended_permanently: "Цей користувач призупинений."
       suspended_reason: "Причина: "
@@ -846,14 +874,14 @@ uk:
         many_per_day: "Надсилати всі нові дописи електронною поштою (близько {{dailyEmailEstimate}} на день)"
         few_per_day: "Надсилати всі нові дописи електронною поштою (близько 2 на день)"
         warning: "Режим списку розсилки увімкнено. Налаштування сповіщень електронною поштою перекрито."
-      tag_settings: "Мітки"
-      watched_tags: "Відслідковувані"
+      tag_settings: "Теги"
+      watched_tags: "Спостереження"
       watched_tags_instructions: "Ви автоматично слідкуватимете за всіма темами з цими мітками. Ви отримуватимете сповіщення про всі нові дописи і теми, а поруч з темою показуватиметься кількість нових дописів."
       tracked_tags: "Відстежувані"
       tracked_tags_instructions: "Ви будете автоматично стежити за всіма темами з цими мітками. Поруч з темою показуватиметься кількість нових дописів."
-      muted_tags: "Ігноровані"
+      muted_tags: "Вимкнено"
       muted_tags_instructions: "Ви не отримуватимете сповіщення ні про що у нових темах з цими мітками, і вони не показуватимуться у найсвіжіших."
-      watched_categories: "Відслідковувані"
+      watched_categories: "Спостереження"
       watched_categories_instructions: "Ви автоматично слідкуватимете за всіма темами у цих категоріях. Ви отримуватимете сповіщення про всі нові дописи і теми, а поруч з темою показуватиметься кількість нових дописів."
       tracked_categories: "Відстежувані"
       tracked_categories_instructions: "Ви будете автоматично стежити за всіма темами у цих категоріях. Поруч з темою показуватиметься кількість нових дописів."
@@ -861,7 +889,7 @@ uk:
       watched_first_post_categories_instructions: "Ви отримуватимете сповіщення про перший допис у кожній новій темі у цих категоріях."
       watched_first_post_tags: "Слідкувати за першим дописом"
       watched_first_post_tags_instructions: "Ви отримуватимете сповіщення про перший допис у кожній новій темі з цими мітками."
-      muted_categories: "Ігноровані"
+      muted_categories: "Вимкнено"
       muted_categories_instructions: "Ви не будете отримувати жодних сповіщень про нові теми у цих категоріях, і вони не з'являтимуться на сторінках категорій чи найсвіжіших."
       muted_categories_instructions_dont_hide: "Ви не будете сповіщені ні про що, що стосується нових тем у цих категоріях."
       no_category_access: "Як модератор, ви маєте обмежений доступ до категорій, збереження вимкнене."
@@ -872,20 +900,20 @@ uk:
       unread_message_count: "Повідомлення"
       admin_delete: "Вилучити"
       users: "Користувачі"
-      muted_users: "Знемовлені"
+      muted_users: "Вимкнені"
       muted_users_instructions: "Приховати усі сповіщення від цих користувачів."
       ignored_users: "Ігноровано"
       ignored_users_instructions: "Приховати усі дописи та сповіщення від цих користувачів."
       tracked_topics_link: "Показати"
       automatically_unpin_topics: "Автоматично відкріпляти теми, коли я доходжу до кінця."
-      apps: " Програми"
+      apps: "Програми"
       revoke_access: "Анулювати доступ"
       undo_revoke_access: "Скасувати анулювання доступу"
       api_approved: "Схвалено:"
       api_last_used_at: "Минуле використання:"
-      theme: "Тема"
+      theme: "Стиль"
       home: "Базова домашня сторінка"
-      staged: "Недокористувач"
+      staged: "Поетапний"
       staff_counters:
         flags_given: "корисні позначки"
         flagged_posts: "позначені дописи"
@@ -903,7 +931,7 @@ uk:
         move_to_archive: "Архівувати"
         failed_to_move: "Не вдалося перемістити обрані повідомлення (можливо, у вас мережа зникла)"
         select_all: "Обрати все"
-        tags: "Мітки"
+        tags: "Теги"
       preferences_nav:
         account: "Обліковий запис"
         profile: "Профіль"
@@ -913,7 +941,7 @@ uk:
         users: "Користувачі"
         tags: "Мітки"
         interface: "Інтерфейс"
-        apps: " Програми"
+        apps: "Програми"
       change_password:
         success: "(лист надіслано)"
         in_progress: "(надсилання листа)"
@@ -932,6 +960,7 @@ uk:
         copied_to_clipboard: "Скопійовано у буфер обміну"
         copy_to_clipboard_error: "Помилка під час копіювання даних у буфер обміну"
         remaining_codes: "У вас залишилося резервних кодів: <strong>{{count}}</strong>."
+        use: "Використовуйте резервний код"
         enable_prerequisites: "Ви повинні увімкнути основний другий фактор, перш ніж генерувати резервні коди."
         codes:
           title: "Резервні коди згенеровано"
@@ -939,10 +968,11 @@ uk:
       second_factor:
         title: "Двофакторна автентифікація"
         enable: "Керувати двофакторною автентифікацією"
+        forgot_password: "Забули пароль?"
         confirm_password_description: "Будь ласка, підтвердіть свій пароль для продовження"
         name: "Ім'я"
         label: "Код"
-        rate_limit: "Будь ласка, зачекайте, перш ніж пробувати наступний код автентифікації."
+        rate_limit: "Будь ласка, зачекайте, перш ніж спробувати наступний код автентифікації."
         enable_description: |
           Відскануйте цей QR-код у підтримуваній програмі (<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>) і введіть свій код автентифікації.
         disable_description: "Будь ласка, введіть код автентифікації з вашої програми"
@@ -952,6 +982,7 @@ uk:
         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: "Використовуйте додаток для перевірки автентифікації "
         enforced_notice: "Ви мусите увімкнути двофакторну автентифікацію, щоб отримати доступ до цього сайту."
         disable: "вимкнути"
         disable_title: "Вимкнути другий фактор"
@@ -959,14 +990,23 @@ uk:
         edit: "Редагувати"
         edit_title: "Редагувати другий фактор"
         edit_description: "Назва другого фактора"
+        enable_security_key_description: "Коли ви підготуєте свій фізичний ключ безпеки, натисніть кнопку Реєстрація нижче."
         totp:
           title: "Автентифікатори на токенах"
           add: "Новий автентифікатор"
           default_name: "Мій автентифікатор"
         security_key:
-          delete: 'Вилучити'
+          register: "Зареєструватися"
+          title: "Ключі безпеки"
+          add: "Зареєструвати ключ безпеки"
+          default_name: "Головний Ключ Безпеки"
+          not_allowed_error: "Час реєстрації ключа безпеки минув, або він був скасований."
+          already_added_error: "Ви вже зареєстрували цей ключ безпеки. Вам не потрібно реєструвати його знову."
+          edit: "Змінити Ключ Безпеки"
+          edit_description: "Назва Ключа Безпеки"
+          delete: "Вилучити"
       change_about:
-        title: "Змінити Про мене"
+        title: "Змінити інформацію про мене"
         error: "Сталася помилка під час цієї зміни."
       change_username:
         title: "Змінити ім'я користувача"
@@ -981,18 +1021,18 @@ uk:
         success_staff: "Ми надіслали листа на вашу поточну скриньку. Будь ласка, виконайте інструкції щодо підтвердження."
       change_avatar:
         title: "Змінити своє зображення профілю"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, враховуючи"
+        gravatar: "На основі <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
         gravatar_title: "Змінити аватарку на сайті Gravatar"
         gravatar_failed: "Не вдалося знайти Gravatar за цією електронною поштою."
         refresh_gravatar_title: "Оновити мій Gravatar"
-        letter_based: "Ваше зображення додане системою"
+        letter_based: "Ваше зображення додане автоматично"
         uploaded_avatar: "Інше зображення"
         uploaded_avatar_empty: "Додати інше зображення"
         upload_title: "Завантажити своє зображення"
         image_is_not_a_square: "Увага: ми обрізали ваше зображення; ширина і висота були неоднакові."
       change_profile_background:
-        title: "Тло профілю"
-        instructions: "Тло профілю буде відцентровано, його ширина 850 пікселів (за замовчуванням)."
+        title: "Заголовок профілю"
+        instructions: "Заголовки профілю будуть по центру та матимуть за замовчуванням ширину 1110 пікселів."
       change_card_background:
         title: "Тло вашої візитки"
         instructions: "Зображення тла будуть відцентровані, ширина за замовчуванням — 590 пікселів."
@@ -1005,49 +1045,94 @@ uk:
         instructions: "Ніколи не показується публічно."
         ok: "Ми надішлемо Вам листа для підтвердження"
         invalid: "Будь ласка, введіть вірний email"
+        authenticated: "Вашу адресу електронної пошти підтверджено {{provider}}"
+        frequency_immediately: "Отримувати повідомлення про нові непрочитані повідомлення негайно."
+        frequency:
+          one: "Ми відправимо вам лист тільки в тому випадку, якщо ви більше {{count}} хвилини перебуваєте оффлайн."
+          few: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні {{count}} хвилин."
+          many: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні {{count}} хвилин."
+          other: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні {{count}} xвилин мaкcимyм,."
       associated_accounts:
+        title: "Пов’язані Облікові Записи"
         connect: "Підключити"
         revoke: "Анулювати"
         cancel: "Скасувати"
+        not_connected: "(не пов’язаний)"
+        confirm_modal_title: "Підключити %{provider} Аккаунт"
+        confirm_description:
+          account_specific: "Ваш %{provider} аккаунт '%{account_description}' буде використовуватися для аутентифікації."
+          generic: "Ваш %{provider} обліковий запис буде використовуватися для аутентифікації."
       name:
         title: "Ім'я"
+        instructions: "ваше повне ім’я (опціонально)"
         instructions_required: "Ваше повне ім’я"
         too_short: "Ваше ім’я надто коротке"
         ok: "Ваше ім’я виглядає добре"
       username:
         title: "Ім'я користувача"
+        instructions: "Унікальний, без пробілів і коротший"
+        short_instructions: "Користувачі можуть згадувати вас за псевдонімом @{{username}}"
         available: "Ваше ім'я доступне"
         not_available: "Не доступно. Спробуєте {{suggestion}}?"
         not_available_no_suggestion: "Не доступно"
         too_short: "Ваше ім'я закоротке"
         too_long: "Ваше ім'я довге"
         checking: "Перевірка доступності імені користувача..."
+        prefilled: "Адреса електронної пошти збігається із зареєстрованим псевдонімом"
       locale:
-        title: "Interface language"
-        default: "(default)"
+        title: "Мова інтерфейсу"
+        instructions: "Мова сайту. Необхідно перезавантажити сторінку, щоб зміни вступили в силу."
+        default: "(за замовчуванням)"
         any: "будь-який"
       password_confirmation:
         title: "Пароль ще раз"
       auth_tokens:
+        title: "Нещодавно використані пристрої"
         ip: "IP"
         details: "Деталі"
+        log_out_all: "Вийти з усіх пристроїв"
+        active: "активні зараз"
+        not_you: "Не ви?"
+        show_all: "Показати всі ({{count}})"
+        show_few: "Показати менше"
+        was_this_you: "Це були ви?"
+        was_this_you_description: "Якщо це були не ви, рекомендуємо змінити пароль і вийти з усіх пристроїв."
+        browser_and_device: "{{browser}} на {{device}}"
+        secure_account: "Захист мого профілю"
+        latest_post: "Ваша остання активність..."
       last_posted: "Останній допис"
       last_emailed: "Останній електронний лист"
       last_seen: "Помічено востаннє"
       created: "Приєднався(лась)"
       log_out: "Вийти"
-      location: "Місцеположення"
+      location: "Місцезнаходження"
       website: "Вебсайт"
       email_settings: "Електронна пошта"
+      hide_profile_and_presence: "Приховати мій загальнодоступний профіль і присутність"
+      enable_physical_keyboard: "Включити підтримку фізичної клавіатури на iPad"
       text_size:
+        title: "Розмір тексту"
+        smaller: "Маленький"
         normal: "Нормальний"
+        larger: "Великий"
+        largest: "Найбільший"
+      title_count_mode:
+        title: "У заголовку фонової сторінки відображається кількість:"
+        notifications: "Нове повідомлення"
+        contextual: "Зміст нової сторінки"
       like_notification_frequency:
+        title: "Повідомляти при отриманні симпатії"
         always: "Завжди"
+        first_time_and_daily: "Для першої симпатії, і далі не частіше разу на день"
+        first_time: "Тільки для першої симпатії"
         never: "Ніколи"
       email_previous_replies:
+        title: "Додати попередні відповіді до кінця електронних листів"
+        unless_emailed: "якщо раніше не відправляли"
         always: "завжди"
         never: "ніколи"
       email_digests:
+        title: "У разі моєї відсутності на форумі, надсилайте мені зведення популярних новин"
         every_30_minutes: "кожні 30 хвилин"
         every_hour: "щогодини"
         daily: "щодня"
@@ -1055,13 +1140,23 @@ uk:
         every_month: "щомісяця"
         every_six_months: "що шість місяців"
       email_level:
+        title: "Надсилати поштове повідомлення, коли хтось цитує мене, відповідає на мій пост, згадує мій @псевдонім або запрошує мене в тему"
         always: "завжди"
+        only_when_away: "тільки коли вдалині"
         never: "ніколи"
+      email_messages_level: "Надсилати поштове повідомлення, коли хтось залишає мені повідомлення"
+      include_tl0_in_digests: "Включити контент від нових користувачів в зведення, що відправляються по електронній пошті"
+      email_in_reply_to: "Додати попередні відповіді до кінця електронних листів"
       other_settings: "Інше"
       categories_settings: "Категорії"
       new_topic_duration:
         label: "Вважати теми новими, якщо"
         not_viewed: "я їх ще не переглянув"
+        last_here: "створені після вашого останнього візиту"
+        after_1_day: "створені за минулий день"
+        after_2_days: "створені за останні 2 дні"
+        after_1_week: "створені за останній тиждень"
+        after_2_weeks: "створені за останні 2 тижні"
       auto_track_topics: "Автоматично слідкувати за темами, що я відвідав"
       auto_track_options:
         never: "ніколи"
@@ -1073,27 +1168,51 @@ uk:
         after_4_minutes: "після 4 хвилин"
         after_5_minutes: "після 5 хвилин"
         after_10_minutes: "після 10 хвилин"
+      notification_level_when_replying: "Коли я пишу в темі, встановити цю тему для"
       invited:
         search: "шукати запрошення..."
         title: "Запрошення"
         user: "Запрошений користувач"
         sent: "Надіслано"
+        none: "Немає запрошень для відображення."
+        truncated:
+          one: "перше запрошення"
+          few: "Перші {{count}} запрошення"
+          many: "Перші {{count}} запрошень"
+          other: "Перші {{count}} запрошень"
         redeemed: "Прийняті запрошення"
         redeemed_tab: "Прийнято"
+        redeemed_tab_with_count: "Прийняті ({{count}})"
         redeemed_at: "Прийнято"
         pending: "Запрошення, що очікують"
         pending_tab: "Очікують"
+        pending_tab_with_count: "Очікують ({{count}})"
         topics_entered: "Тем переглянуто"
         posts_read_count: "Прочитано дописів"
         expired: "Термін дії цього запрошення сплив."
         rescind: "Видалити"
         rescinded: "Запрошення видалено"
+        rescind_all: "Видалити всі прострочені запрошення"
+        rescinded_all: "Всі прострочені запрошення видалені!"
+        rescind_all_confirm: "Ви впевнені, що хочете видалити всі прострочені запрошення?"
+        reinvite: "повторити запрошення"
+        reinvite_all: "Повторити всі запрошення"
+        reinvite_all_confirm: "Ви дійсно хочете відправити всі запрошення повторно?"
+        reinvited: "Запрошення надіслано повторно"
+        reinvited_all: "Всі запрошення вислані повторно!"
         time_read: "Час читання"
         days_visited: "Днів відвідано"
         account_age_days: "Вік облікового запису в днях"
         create: "Надіслати Запрошення"
+        generate_link: "Копіювати посилання для запрошень"
+        link_generated: "Запрошувальна посилання успішно створена!"
+        valid_for: "Запрошувальне посилання дійсне тільки для цієї адреси електропошти:%{email}"
         bulk_invite:
+          none: "Ви ще нікого не запрошували сюди. Надішліть індивідуальні запрошення або запросіть кілька людей за раз, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>завантаживши файл CSV</a>."
           text: "Масове Запрошення з Файлу"
+          success: "Файл успішно завантажений, ви отримаєте повідомлення, коли процес буде завершений."
+          error: "Вибачте, але файл повинен бути у форматі CSV."
+          confirmation_message: "Ви збираєтеся відправити запрошення електронною поштою всім в завантаженому файлі."
       password:
         title: "Пароль"
         too_short: "Ваш пароль надто короткий."
@@ -1101,21 +1220,83 @@ uk:
         same_as_username: "Ваш пароль ідентичний імені користувача"
         same_as_email: "Ваш пароль ідентичний Вашому email"
         ok: "Ваш пароль добрий."
+        instructions: "не менше %{count} символів"
       summary:
         title: "Підсумок"
         stats: "Статистика"
         time_read: "час читання"
+        recent_time_read: "недавній час читання"
+        topic_count:
+          one: "тему створив"
+          few: "теми створив"
+          many: "тем створив"
+          other: "тем створив"
+        post_count:
+          one: "повідомлення написав"
+          few: "повідомлення написав"
+          many: "повідомлень написав"
+          other: "повідомлень написав"
+        likes_given:
+          one: "даний"
+          few: "даних"
+          many: "даних"
+          other: "дані"
+        likes_received:
+          one: "отримано"
+          few: "отримано"
+          many: "отримано"
+          other: "отримано"
+        days_visited:
+          one: "день заходив"
+          few: "дня заходив"
+          many: "днів заходив"
+          other: "днів заходив"
+        topics_entered:
+          one: "подивився тему"
+          few: "подивився тем"
+          many: "переглянуто тем"
+          other: "переглянуто тем"
+        posts_read:
+          one: "повідомлення прочитав"
+          few: "повідомлення прочитав"
+          many: "повідомлень прочитав"
+          other: "повідомлень прочитав"
+        bookmark_count:
+          one: "закладка"
+          few: "закладки"
+          many: "закладок"
+          other: "закладок"
+        top_replies: "Кращі повідомлення"
+        no_replies: "Ще не написав жодного повідомлення."
+        more_replies: "... інші повідомлення"
+        top_topics: "Кращі теми"
+        no_topics: "Поки не створив жодної теми."
         more_topics: "Більше тем"
+        top_badges: "Найпрестижніші нагороди"
+        no_badges: "Ще не отримав жодної нагороди."
+        more_badges: "... інші нагороди"
+        top_links: "Кращі посилання"
+        no_links: "Поки немає посилань."
+        most_liked_by: "Шанувальники"
+        most_liked_users: "Фаворити"
+        most_replied_to_users: "Найактивніші співрозмовники"
+        no_likes: "Поки жодної симпатії."
+        top_categories: "Кращі Категорії"
         topics: "Теми"
         replies: "Відповіді"
       ip_address:
         title: "Остання IP-адреса"
       registration_ip_address:
-        title: "IP Адреса Реєстрації"
+        title: "IP Адреса реєстрації"
       avatar:
         title: "Аватар"
+        header_title: "профіль, повідомлення, закладки та налаштування"
       title:
         title: "Назва"
+        none: "(немає)"
+      primary_group:
+        title: "Primary Group"
+        none: "(немає)"
       filters:
         all: "Всі"
       stream:
@@ -1125,25 +1306,43 @@ uk:
         the_topic: "тема"
     loading: "Завантаження..."
     errors:
+      prev_page: "при спробі завантаження"
       reasons:
-        network: "Помилка Мережі"
+        network: "Помилка мережі"
         server: "Серверна помилка"
         forbidden: "Немає доступу"
         unknown: "Помилка"
+        not_found: "Сторінка не знайдена"
       desc:
         network: "Будь ласка, перевірте з'єднання."
+        network_fixed: "Схоже, мережа з’явилася."
         server: "Код помилки: {{status}}"
         forbidden: "Вам не дозволено це переглядати."
+        not_found: "Упс, сталася спроба завантажити неіснуюче посилання"
         unknown: "Щось пішло не так."
       buttons:
         back: "Повернутися"
         again: "Спробувати ще раз"
         fixed: "Завантаження Сторінки"
     close: "Закрити"
+    assets_changed_confirm: "Сайт тільки що був оновлений. Перезавантажити сторінку для переходу до нової версії?"
+    logout: "Ви вийшли."
     refresh: "Оновити"
     read_only_mode:
-      login_disabled: "Login is disabled while the site is in read only mode."
+      enabled: "Сайт працює в режимі \"тільки для читання\". Зараз ви можете продовжувати переглядати сайт, але інші дії будуть недоступні. "
+      login_disabled: "Вхід вимкнено, поки сайт перебуває в режимі лише для читання."
+      logout_disabled: "Вихід відключений, поки сайт в режимі «тільки для читання»"
+    too_few_topics_and_posts_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>почнемо обговорення!</a> Есть <strong>%{currentTopics}</strong> тем та <strong>%{currentPosts}</strong> постів. Користувачі повинні більше читати та відповідати - ми рекомендуємо, принаймні <strong>%{requiredTopics}</strong> тем та <strong>%{requiredPosts}</strong> постів. Тільки співробітники можуть бачити це повідомлення."
+    too_few_topics_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>почнемо обговорення!</a> Есть <strong>%{currentTopics}</strong> тем. Користувачі повинні більше читати та відповідати - ми рекомендуємо, принаймні <strong>%{requiredTopics}</strong> тем. Тільки співробітники можуть бачити це повідомлення."
+    too_few_posts_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>почнемо обговорення!</a> Есть <strong>%{currentPosts}</strong> постов. Користувачам потрібно більше читати та відповідати - ми рекомендуємо хоча б <strong>%{requiredPosts}</strong> постів. Тільки співробітники можуть бачити це повідомлення."
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} або {# errors/hour}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/hour} або {# errors/hour}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} або {# errors/minute}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/minute} або {# errors/minute}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} або {# errors/hour}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/hour} або {# errors/hour}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} або {# errors/minute}}</a> перевищено максимально дозволене значення {limit, plural, one {# error/minute} або {# errors/minute}}."
     learn_more: "дізнатися більше..."
+    all_time: "всього"
+    all_time_desc: "всього створено тем"
     year: "рік"
     year_desc: "теми, що були створені у останні 365 днів"
     month: "місяць"
@@ -1154,21 +1353,40 @@ uk:
     first_post: Перший допис
     mute: Mute
     unmute: Unmute
+    last_post: Останнє повідомлення
     time_read: Прочитані
+    time_read_recently: "%{time_read} недавно"
+    time_read_tooltip: "%{time_read} загальний час читання"
+    time_read_recently_tooltip: "%{time_read} загальний час читання (%{recent_time_read} за останні 60 днів)"
+    last_reply_lowercase: остання відповідь
+    replies_lowercase:
+      one: відповідь
+      few: відповіді
+      many: відповідей
+      other: відповідь
     signup_cta:
       sign_up: "Зареєструватись"
       hide_session: "Нагадати мені завтра"
       hide_forever: "ні дякую"
+      hidden_for_session: "Добре, нагадаю завтра. До речі, зареєструватися можна також та за допомогою кнопки \"Увійти\"."
+      intro: "Вітаємо! Схоже, вам подобається обговорення, але ви ще не зареєстрували акаунт."
+      value_prop: "Коли ви створюєте обліковий запис, ми точно пам’ятаємо, що ви прочитали, тому ви завжди повертаєтеся туди, де зупинилися. Ви також отримуєте повідомлення, тут та електронною поштою, коли хтось відповідає вам. І ви можете, в повідомленнях, поставити - мені подобається. :heartpulse:"
     summary:
-      enable: "Підсумувати цю тему"
+      enabled_description: "Ви переглядаєте витяг з теми - тільки найцікавіші повідомлення на думку спільноти."
+      description: "Є <b>{{replyCount}}</b> відповідей."
+      description_time: "<b>{{replyCount}}</b> відповідей з передбачуваним часом прочитання близько <b>{{readingTime}} хвилин</b>."
+      enable: "Підсумки цієї теми"
       disable: "Показати всі дописи"
     deleted_filter:
       enabled_description: "Ця тема містить видалені дописи, які були сховані."
       disabled_description: "Видалені дописи в цій темі показано."
-      enable: "Сховати Видалені Дописи"
+      enable: "Сховати видалені дописи"
       disable: "Показати видалені дописи"
     private_message_info:
       title: "Повідомлення"
+      invite: "Запросити інших..."
+      edit: "Додати або Видалити..."
+      leave_message: "Ви дійсно хочете залишити це повідомлення?"
       remove_allowed_user: "Ви впевнені, що хочете видалити {{name}} з цього повідомлення?"
       remove_allowed_group: "Ви впевнені, що хочете видалити {{name}} з цього повідомлення?"
     email: "Електронна пошта"
@@ -1179,6 +1397,7 @@ uk:
     trust_level: "Рівень довіри"
     search_hint: "ім'я користувача, email або IP-адреса"
     create_account:
+      disclaimer: "Реєструючись, ви погоджуєтеся з <a href='{{privacy_link}}' target='blank'>політикою конфіденційності</a> та <a href='{{tos_link}}' target='blank'>умовами надання послуг</a>."
       title: "Створити Новий Обліковий Запис"
       failed: "Щось пішло не так; скоріше за все, цю електронну пошту вже зареєстровано, спробуйте посилання Забув пароль"
     forgot_password:
@@ -1187,17 +1406,49 @@ uk:
       invite: "Введіть своє ім'я користувача або адресу електронної скриньки, і ми надішлемо Вам лист для скинення пароля."
       reset: "Скинути пароль"
       complete_username: "Якщо обліковий запис збігається з <b>%{username}</b>, у найближчий час ви отримаєте email з інструкціями, як змінити ваш пароль."
+      complete_email: "Якщо обліковий запис збігається з <b>%{email}</b>, ви повинні отримати лист з інструкціями про те, як швидко скинути ваш пароль."
+      complete_username_found: "Ми знайшли обліковий запис з псевдонімом <b>%{username}</b> та вислали вам на e-mail інструкції щодо скидання пароля."
+      complete_email_found: "Ми знайшли обліковий запис з адресою електронної пошти <b>%{email}</b> та вислали туди інструкцію по скиданню пароля."
+      complete_username_not_found: "Не знайдено облікового запису з псевдонімом <b>%{username}</b>"
+      complete_email_not_found: "Не знайдено облікового запису з адресою електронної пошти <b>%{email}</b>"
+      help: "Електронний лист не доходить? Для початку перевірте папку «Спам» вашої поштової скриньки. <p>Не впевнені в тому, яку адресу використовували? Введіть його та ми підкажемо, чи є він в нашій базі.</p> <p>Якщо ви більше не маєте доступу до пов’язаного з вашим обліковим записом адресою електронної пошти, то, будь ласка, зв’яжіться з <a href = '%{basePath } / about '>адміністрацією.</a></p>"
       button_ok: "OK"
+      button_help: "Допомога"
     email_login:
+      link_label: "Надішліть мені посилання для входу "
+      button_label: "E-mail"
+      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: Завершити Вхід
     login:
       title: "Увійти"
       username: "Користувач"
       password: "Пароль"
       second_factor_title: "Двофакторна автентифікація"
+      second_factor_description: "Введіть код аутентифікації з вашого додатки:"
+      second_factor_backup: "Увійти за допомогою запасного коду"
+      second_factor_backup_title: "Запасний вхід двофакторної аутентифікації"
+      second_factor_backup_description: "Введіть запасний код:"
+      second_factor: "Увійти за допомогою програми аутентифікації"
+      security_key_description: "Коли ви підготуєте свій фізичний ключ безпеки, натисніть кнопку Аутентификация з ключем безпеки нижче."
+      security_key_alternative: "Неможливо знайти ключ безпеки або хочете використовувати інший метод?"
+      security_key_authenticate: "Аутентифікація з Ключем Безпеки."
+      security_key_not_allowed_error: "Час перевірки автентичності ключа безпеки минув або було скасовано."
+      security_key_no_matching_credential_error: "У зазначеному ключі безпеки не знайдено відповідних облікових даних."
+      security_key_support_missing_error: "Ваше поточне пристрій або браузер не підтримує використання ключів безпеки. Будь ласка, використовуйте інший метод."
       email_placeholder: "електронна скринька або ім'я користувача"
       caps_lock_warning: "Caps Lock увімкнено"
       error: "Невідома помилка"
+      cookies_error: "Схоже, що в вашому браузері вимкнені куки. Це завадить входу на сайт під своїм обліковим записом."
+      rate_limit: "Зробіть перерву перед черговою спробою входу."
+      blank_username: "Введіть ваш e-mail або псевдонім."
+      blank_username_or_password: "Введіть ваш e-mail (або псевдонім) та пароль."
       reset_password: "Скинути пароль"
       logging_in: "Вхід..."
       or: "Або"
@@ -1206,11 +1457,19 @@ uk:
       awaiting_approval: "Ваш обліковий запис ще не затверджено членом команди. Коли його буде активовано, Ви отримаєте електронного листа."
       requires_invite: "Даруйте, доступ до цього форуму - лише за запрошеннями."
       not_activated: "Ви ще не можете увійти. Ми вже надіслали Вам листа для активації на скриньку <b>{{sentTo}}</b>. Будь ласка, виконайте інструкції в цьому листі, щоб активувати обліковий запис."
+      not_allowed_from_ip_address: "З цієї IP адреси вхід заборонений."
+      admin_not_allowed_from_ip_address: "З цієї IP адреси вхід адміністраторів заборонений."
       resend_activation_email: "Натисніть тут, щоб отримати ще один лист з активацією."
+      omniauth_disallow_totp: "У вашого профілю включена двухфакторная аутентифікація. Будь ласка, увійдіть під своїм паролем."
       resend_title: "Надіслати ще раз листа для активації"
       change_email: "Змінити електронну скриньку"
+      provide_new_email: "Вкажіть нову адресу електронної пошти, щоб задіяти його та заново вислати лист із кодом активації."
+      submit_new_email: "Оновити електронну пошту"
       sent_activation_email_again: "Ми надіслали на Вашу скриньку <b>{{currentEmail}}</b> ще один лист для активації облікового запису. Протягом кількох хвилин він має з'явитися у Вашій скриньці. Не забувайте також перевіряти теку зі спамом."
+      sent_activation_email_again_generic: "Ми відправили ще один лист для активації. Це може зайняти кілька хвилин для того, щоб лист було доставлено; не забудьте перевірити папку зі спамом."
       to_continue: "Будь ласка Увійдіть"
+      preferences: "Необхідно увійти на сайт для редагування налаштувань профілю."
+      forgot: "Я не пам’ятаю дані мого профілю"
       not_approved: "Ваш обліковий запис ще не було схвалено. Ви отримаєте сповіщення на електронну скриньку, коли зможете увійти."
       google_oauth2:
         name: "Google"
@@ -1222,123 +1481,401 @@ uk:
         name: "Instagram"
         title: "через Instagram"
       facebook:
+        name: "Facebook"
         title: "через Facebook"
       github:
+        name: "GitHub"
         title: "через GitHub"
+      discord:
+        name: "Discord"
+        title: "з Discord"
+      second_factor_toggle:
+        totp: "Замість цього використовуйте додаток для перевірки автентичності"
+        backup_code: "Замість цього використовуйте резервний код"
     invites:
+      accept_title: "Запрошення"
       welcome_to: "Ласкаво просимо до сайта %{site_name}!"
+      invited_by: "Ви були запрошені:"
+      social_login_available: "Ви також зможете входити через соціальні мережі, використовуючи цю адресу електронної пошти."
+      your_email: "Ваша електронна адреса аккаунта <b>%{email}</b>."
+      accept_invite: "Прийняти запрошення"
+      success: "Ваш аккаунт створений та ви можете тепер увійти."
       name_label: "Ім'я"
       password_label: "Встановити пароль"
+      optional_description: "(опціонально)"
     password_reset:
-      continue: "Продовжити у %{site_name}"
+      continue: "Продовжити на %{site_name}"
     emoji_set:
+      apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (ранее EmojiOne)"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
+    category_page_style:
+      categories_only: "Тільки розділи"
+      categories_with_featured_topics: "Розділи та їх найкращі теми"
+      categories_and_latest_topics: "Розділи та список останніх тем форуму"
+      categories_and_top_topics: "Категорії та головні теми"
+      categories_boxes: "Коробки з підкатегорій"
+      categories_boxes_with_topics: "Коробки з Обраними Темами"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
+      enter: "Увійти"
     conditional_loading_section:
       loading: Завантаження...
+    category_row:
+      topic_count: "{{count}} тем в цій категорії"
+    select_kit:
+      default_header_text: Вибрати...
+      no_content: "Збігів, не знайдено"
+      filter_placeholder: Пошук...
+      filter_placeholder_with_any: Знайти або створити...
+      create: "Створити: '{{content}}'"
+      max_content_reached:
+        one: "Можна вибрати тільки {{count}} елемент."
+        few: "Можна вибрати тільки {{count}} елементів."
+        many: "Можна вибрати тільки {{count}} елементів."
+        other: "Можна вибрати тільки {{count}} елемент."
+      min_content_not_reached:
+        one: "Введіть хоча б {{count}} елемент."
+        few: "Введіть хоча б {{count}} елементів."
+        many: "Введіть хоча б {{count}} елементів."
+        other: "Введіть хоча б {{count}} елемент."
     date_time_picker:
       from: Від
       to: До
+      errors:
+        to_before_from: "На сьогоднішній день має бути пізніше, ніж з дати."
     emoji_picker:
+      filter_placeholder: Шукати emoji
+      smileys_&_emotion: Смайли та емоції
+      people_&_body: Люди та частини тіл
+      animals_&_nature: Тварини та Природа
+      food_&_drink: Їжа та Напої
+      travel_&_places: Подорожі та Місця
+      activities: Діяльність
+      objects: Objects
+      symbols: Атрибутика
       flags: Скарги
+      custom: Призначені для користувача смайли
+      recent: Нещодавно використані
+      default_tone: Немає скіна
+      light_tone: Світлий тон скіна
+      medium_light_tone: Середній світлий тон скіна
+      medium_tone: Середній тон скіна
+      medium_dark_tone: Середній темний тон скіна
+      dark_tone: Темний відтінок скіна
+    shared_drafts:
+      title: "загальні Чернетки"
+      notice: "Ці теми видно тільки тим, хто може бачити <b>{{category}}</b> категорію."
+      destination_category: "Категорія Призначення"
+      publish: "Публікація Спільної чернетки"
+      confirm_publish: "Ви впевнені, що хочете опублікувати цю чернетку?"
+      publishing: "Публікація теми..."
     composer:
+      emoji: "Смайлики :)"
       more_emoji: "ще..."
       options: "Налаштування"
+      whisper: "Внутрішнє повідомлення"
+      unlist: "Виключена зі списків тем"
       blockquote_text: "Цитата"
+      add_warning: "Це офіційне попередження."
+      toggle_whisper: "Внутрішнє повідомлення"
+      toggle_unlisted: "Сховати зі списків тем"
       posting_not_on_topic: "На яку тему Ви хочете відповісти?"
       saved_local_draft_tip: "збережено локально"
       similar_topics: "Ваша тема схожа на..."
       drafts_offline: "чернетки в офлайні"
+      edit_conflict: "Редагувати конфлікт"
+      group_mentioned_limit: "<b>Увага!</b> Ви згадали <a href='{{group_link}}'>{{group}}</a>, в якій більше учасників, ніж встановлений адміністратором ліміт згадок на {{max}} користувачів. Ніхто не отримає сповіщення."
+      group_mentioned:
+        one: "Згадуючи групу {{group}}, ви тем самим відправите повідомлення <a href='{{group_link}}'>%{count}му користувачеві</a> - ви впевнені?"
+        few: "Згадуючи групу {{group}}, ви тим самим відправите повідомлення <a href='{{group_link}}'>{{count}} користувачам</a> - ви впевнені?"
+        many: "Згадуючи групу {{group}}, ви тим самим відправите повідомлення <a href='{{group_link}}'>{{count}} користувачам</a> - ви впевнені?"
+        other: "Згадуючи групу {{group}}, ви тим самим відправите повідомлення <a href='{{group_link}}'>{{count}} користувачам</a> - ви впевнені?"
+      cannot_see_mention:
+        category: "Ви згадали {{username}}, але вони не одержать повідомлення, тому що у них немає доступу до цього розділу. Вам потрібно додати їх до групи, що має доступ до цього розділу."
+        private: "Ви згадали {{username}}, але вони не одержать повідомлення, тому що вони не можуть бачити це приватне повідомлення. Вам потрібно запросити їх в це PM."
+      duplicate_link: "Здається, ваше посилання на <b>{{domain}}</b> вже була раніше розміщена користувачем <b>@{{username}}</b> у <a href='{{post_url}}'>відповіді {{ago}}</a>. Ви точно хочете размістити її ще раз?"
+      reference_topic_title: "RE: {{title}}"
       error:
         title_missing: "Заголовок є необхідним"
         title_too_short: "Заголовок має бути мінімум {{min}} символів"
         title_too_long: "Заголовок не може бути менше, ніж {{max}} символів"
+        post_missing: "Повідомлення не може бути порожнім"
         post_length: "Найменший розмір допису має бути {{min}} символів"
+        try_like: "Ви пробували натиснути на {{heart}} кнопку?"
         category_missing: "Ви повинні обрати категорію"
         tags_missing: "Ви маєте вибрати хоча б {{count}} міток"
+        topic_template_not_modified: "Впишіть опис об’єкта в шаблон"
       save_edit: "Зберегти зміни"
+      overwrite_edit: "Перезаписати, правити"
       reply_original: "Відповісти в початковій темі"
       reply_here: "Відповісти тут"
       reply: "Відповісти"
       cancel: "Скасувати"
       create_topic: "Створити тему"
       create_pm: "Повідомлення"
-      title: "Or press Ctrl+Enter"
+      create_whisper: "Внутрішнє повідомлення"
+      create_shared_draft: "Створити Загальний проект"
+      edit_shared_draft: "Редагувати загальну чернетку"
+      title: "Або натисніть Ctrl+Enter"
       users_placeholder: "Додати користувача"
       title_placeholder: "Про що це обговорення, у одному короткому реченні?"
+      title_or_link_placeholder: "Введіть назву, або вставте тут посилання"
       edit_reason_placeholder: "чому Ви редагуєте допис?"
+      topic_featured_link_placeholder: "Введіть посилання, що відображається з назвою."
+      remove_featured_link: "Видалити посилання з теми."
+      reply_placeholder: "Підтримувані формати: Markdown, BBCode та HTML. Щоб вставити картинку, перетягніть її сюди або вставте за допомогою Ctrl + V, Command-V, або натисніть правою кнопкою миші та виберіть меню \"вставити\"."
+      reply_placeholder_no_images: "Введіть тут. Використовуйте Markdown, BBCode або HTML для форматування."
+      reply_placeholder_choose_category: "Виберіть категорію перед введенням тут."
       view_new_post: "Перегляньте свій новий допис."
       saving: "Збереження"
       saved: "Збережено!"
+      saved_draft: "Чернетка збережена; натисніть сюди, щоб її відкрити."
       uploading: "Завантаження..."
       show_preview: "попередній перегляд &raquo;"
       hide_preview: "&laquo; сховати попередній перегляд"
       quote_post_title: "Процитувати весь допис повністю"
+      bold_label: "Ж"
       bold_title: "Сильне виділення"
       bold_text: "Сильне виділення тексту"
-      italic_title: "Виділення"
-      italic_text: "виділення тексту"
+      italic_label: "К"
+      italic_title: "Курсив"
+      italic_text: "виділення тексту курсивом"
       link_title: "Гіперпосилання"
       link_description: "введіть опис посилання"
       link_dialog_title: "Вставити гіперпосилання"
       link_optional_text: "необов'язкова назва"
+      link_url_placeholder: "Вставте URL або введіть для пошуку теми"
       quote_title: "Цитата"
       quote_text: "Цитата"
       code_title: "Попередньо форматований текст"
+      code_text: "Впишіть сюди текст; також, відключити форматування тексту можна, почавши рядок з 4х прогалин"
+      paste_code_text: "Надрукуйте або вставте сюди код"
       upload_title: "Завантажити"
       upload_description: "введіть опис завантаження"
       olist_title: "Нумерований список"
       ulist_title: "Маркований список"
       list_item: "Елемент списку"
+      toggle_direction: "Переключити Напрямок"
       help: "Markdown Editing Help"
+      collapse: "згорнути панель композитора"
+      open: "відкрити панель композитора"
+      abandon: "закрити композитор та скасувати чернетку"
+      enter_fullscreen: "введіть повноекранний композитор"
+      exit_fullscreen: "вийти з повноекранного режиму композитора"
       modal_ok: "OK"
       modal_cancel: "Скасувати"
-      admin_options_title: "Необов'язкові налаштування персоналу для цієї теми"
+      cant_send_pm: "На жаль, ви не можете відправляти повідомлення користувачу %{username}."
+      yourself_confirm:
+        title: "Забули вказати одержувачів?"
+        body: "У списку одержувачів зараз тільки ви самі!"
+      admin_options_title: "Необов’язкові налаштування персоналу для цієї теми"
       composer_actions:
         reply: Відповісти
+        draft: Чернетка
         edit: Редагувати
+        reply_to_post:
+          label: "Відповісти на повідомлення %{postNumber} від %{postUsername}"
+          desc: Відповідь на конкретний пост
+        reply_as_new_topic:
+          label: Відповісти в новій пов’язаної темі
+          desc: "Створити нову тему, пов’язану з цією темою"
+        reply_as_private_message:
+          label: Сворити нове
+          desc: Створити нове приватне повідомлення
+        reply_to_topic:
+          label: Відповісти на тему
+          desc: "Відповідь на тему, а не який-небудь конкретний пост"
+        toggle_whisper:
+          label: Включити шепіт
+          desc: Шепіт видно тільки персоналу
         create_topic:
           label: "Нова тема"
+        shared_draft:
+          label: "Загальний Проект"
+          desc: "Проект теми, яку буде видно тільки співробітникам"
+        toggle_topic_bump:
+          label: "Не піднімати тему"
+          desc: "Відповісти без зміни дати останньої відповіді"
     notifications:
+      tooltip:
+        regular:
+          one: "%{count} невидиме повідомлення"
+          few: "{{count}} невидимі повідомлення"
+          many: "{{count}} невидимих ​​повідомлень"
+          other: "{{count}} невидимі повідомлення"
+        message:
+          one: "%{count} непрочитані"
+          few: "{{count}} непрочитаних повідомлень"
+          many: "{{count}} непрочитаних повідомлень"
+          other: "{{count}} непрочитаних повідомлень"
+      title: "повідомлення при згадці @псевдоніма, відповідях на ваші пости та теми, повідомлення та т.д."
+      none: "Повідомлення не можуть бути завантажені."
+      empty: "Повідомлення не знайдені."
+      post_approved: "Ваш пост був схвалений"
+      reviewable_items: "пункти, що вимагають розгляду"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: "<span>{{username}}, {{username2}} та %{count} інший</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} та {{count}} інші</span> {{description}}"
+        many: "<span>{{username}}, {{username2}} та {{count}} інші</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} та {{count}} інші</span> {{description}}"
+      liked_consolidated_description:
+        one: "Сподобався {{count}} ваш пост"
+        few: "Сподобалося {{count}} ваших поста"
+        many: "Сподобалося {{count}} ваших постів"
+        other: "Сподобалося {{count}} ваших поста"
+      liked_consolidated: "<span>{{username}}</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> принял ваше приглашение"
+      moved_post: "<span>{{username}}</span> moved {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Заслужив(а) '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Нова тема</span> {{description}}"
+      membership_request_accepted: "Запит на вступ прийнятий '{{group_name}}'"
+      group_message_summary:
+        one: "{{count}} повідомлення в вашій групі: {{group_name}} "
+        few: "{{count}} повідомлень в вашій групі: {{group_name}} "
+        many: "{{count}} повідомлень в вашій групі: {{group_name}} "
+        other: "{{count}} повідомлень в вашій групі: {{group_name}} "
+      popup:
+        mentioned: '{{username}} згадав вас у "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} згадав вас у "{{topic}}" - {{site_title}}'
+        quoted: '{{username}} процитував вас у "{{topic}}" - {{site_title}}'
+        replied: '{{username}} відповів вам у "{{topic}}" - {{site_title}}'
+        posted: '{{username}} написав у "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} відправив вам приватне повідомлення в "{{topic}}" - {{site_title}}'
+        linked: '{{username}} посилається на ваш пост у темі: "{{topic}}" - {{site_title}}'
+        watching_first_post: '{{username}} створив нову тему "{{topic}}" - {{site_title}}'
+        confirm_title: "Повідомлення включені - %{site_title}"
+        confirm_body: "Успішно! Повідомлення були включені."
+        custom: "Повідомлення від {{username}} до %{site_title}"
       titles:
+        mentioned: "згаданий"
+        replied: "нову відповідь"
+        quoted: "цитований"
+        edited: "відредагований"
+        liked: "нова симпатія"
+        private_message: "нове приватне повідомлення"
+        invited_to_private_message: "запрошений в приватне повідомлення"
+        invitee_accepted: "запрошення прийнято"
+        posted: "новий пост"
+        moved_post: "повідомлення переміщено"
+        linked: "пов’язаний"
+        granted_badge: "нагорода отримана"
+        invited_to_topic: "запрошений в тему"
+        group_mentioned: "згадана група"
+        group_message_summary: "нові групові повідомлення"
         watching_first_post: "нова тема"
+        topic_reminder: "нагадування про тему"
+        liked_consolidated: "нові симпатії"
+        post_approved: "повідомлення затверджено"
     upload_selector:
       title: "Додати зображення"
       title_with_attachments: "Додати зображення або файл"
       from_my_computer: "З мого пристрою"
       from_the_web: "З інтернету"
+      remote_tip: "посилання на зображення"
+      remote_tip_with_attachments: "посилання на зображення або файл {{authorized_extensions}}"
+      local_tip: "вибрати зображення з вашого пристрою"
+      local_tip_with_attachments: "вибрати зображення або файли з вашого пристрою {{authorized_extensions}}"
       hint: "(Ви також можете перетягувати зображення в редактор, щоб їх завантажити)"
+      hint_for_supported_browsers: "ви так само можете перетягнути або скопіювати зображення в редактор"
       uploading: "Завантаження"
       select_file: "Обрати файл"
+      image_link: "посилання, на яке буде вказувати ваше зображення"
       default_image_alt_text: зображення
     search:
       sort_by: "Сортувати за"
+      relevance: "За змістом"
       latest_post: "Останній допис"
+      latest_topic: "Остання тема"
+      most_viewed: "Найбільш переглянуті"
+      most_liked: "Найбільше симпатій"
       select_all: "Обрати все"
+      clear_all: "Скинути все"
+      too_short: "Занадто коротке слово для пошуку."
+      result_count:
+        one: "<span>%{count} результат для </span><span class='term'>{{term}}</span>"
+        few: "<span>{{count}} {{plus}} результатів для </span><span class='term'>{{term}}</span>"
+        many: "<span>{{count}} {{plus}} результат для </span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}} {{plus}} результатів для </span><span class='term'>{{term}}</span>"
+      title: "Пошук по темам, повідомленням, псевдонімам та розділам"
+      full_page_title: "пошук тем або повідомлень"
       no_results: "Нічого не знайдено."
+      no_more_results: "Більше нічого не знайдено."
       searching: "Пошук ..."
+      post_format: "#{{post_number}} від {{username}}"
+      results_page: "Результати пошуку для '{{term}}'"
+      more_results: "Знайдено безліч результатів. Будь ласка, уточніть, критерії пошуку."
+      cant_find: "Не можете знайти потрібну інформацію?"
+      start_new_topic: "Створити нову тему?"
+      or_search_google: "Або спробуйте пошукати в Google:"
+      search_google: "Спробуйте пошукати в Google:"
       search_google_button: "Google"
       search_google_title: "Пошук на цьому сайті"
       context:
+        user: "Шукати повідомлення від @{{username}}"
+        category: "Шукати в розділі #{{category}}"
         topic: "Пошук в цій темі"
-        private_messages: "Шукати повідомлення"
+        private_messages: "Шукати приватні повідомлення"
       advanced:
         title: Розширений пошук
         posted_by:
           label: Опубліковано
+        in_category:
+          label: Разділи
         in_group:
           label: У групі
+        with_badge:
+          label: З нагородами
         with_tags:
           label: Позначено
         filters:
+          label: Обмежити пошук по темам/повідомленням...
+          title: Збігам в заголовку
+          likes: Мені сподобалися
+          posted: В яких я писав
+          watching: За якими я спостерігаю
+          tracking: За якими я стежу
+          private: У моїх повідомленнях
+          bookmarks: Мої закладки
+          first: Тільки перші повідомлення в темах
+          pinned: Закріплені
+          unpinned: Не закріплені
+          seen: Читання
+          unseen: Позначити непрочитаними
+          wiki: Є вікі
+          images: включити зображення
           all_tags: Усі мітки вгорі
+        statuses:
+          label: Де теми
+          open: відкрита
+          closed: закрита
+          archived: заархівувана
+          noreplies: без відповідей
+          single_user: зез відповідей
         post:
+          count:
+            label: Мінімум повідомлень в темі
           time:
+            label: Дата
             before: перед
             after: після
     hamburger_menu: "перейти до іншого переліку або категорії тем"
@@ -1346,18 +1883,34 @@ uk:
     go_back: "повернутися назад"
     not_logged_in_user: "сторінка користувача з підсумком поточної діяльності та налаштуваннями"
     current_user: "перейти до Вашої сторінки користувача"
+    view_all: "подивитись все"
     topics:
       new_messages_marker: "останнє відвідування"
       bulk:
         select_all: "Обрати все"
-        reset_read: "Reset Read"
+        clear_all: "Скасувати вибір"
+        unlist_topics: "Виключити з усіх списків тем"
+        relist_topics: "Повторний Список тем"
+        reset_read: "Скинути прочитані"
         delete: "Видалити теми"
         dismiss: "Відкинути"
+        dismiss_read: "Відхилити всі непрочитані"
+        dismiss_button: "Відкласти..."
+        dismiss_tooltip: "Відкласти нові повідомлення, або перестати стежити за цими темами"
+        also_dismiss_topics: "Перестати стежити за цими темами, щоб вони ніколи більше не висвітлювались як непрочитані"
         dismiss_new: "Dismiss New"
         toggle: "перемикач масової дії над темами"
         actions: "Масові дії"
+        change_category: "Задати розділ"
         close_topics: "Закрити теми"
+        archive_topics: "Архівувати теми"
         notification_level: "Сповіщення"
+        choose_new_category: "Виберіть новий розділ для цих тем:"
+        selected:
+          one: "Ви вибрали <b>{{count}}</b> тему."
+          few: "Ви вибрали <b>{{count}}</b> теми."
+          many: "Ви вибрали <b>{{count}}</b> тем."
+          other: "Ви вибрали <b>{{count}}</b> тем."
         change_tags: "Замінити мітки"
         append_tags: "Додати мітки"
         choose_new_tags: "Виберіть нові мітки для цих тем:"
@@ -1369,45 +1922,98 @@ uk:
         read: "Ви ще не прочитали жодної теми."
         posted: "Ви ще не дописували в жодну тему."
         latest: "Останніх тем немає. Шкода."
+        bookmarks: "У вас немає обраних тем."
         category: "В категорії {{category}} немає тем."
         top: "There are no top topics."
+        educate:
+          new: '<p>Ваші нові теми скоро з’являться тут.</p><p>За замовчуванням, нові теми відзначаються іконкою: <span class="badge new-topic badge-notification" style="vertical-align: middle; line-height: inherit;">Нова</span>, якщо вона була створена протягом 2 тижнів.</p><p>Перейдіть в <a href="%{userPrefsUrl}">настройки</a> для того, щоб вибрати період активності нових тем.</p>'
+          unread: '<p>Ваші непрочитані теми скоро з’являться тут.</p><p>За замовчуванням теми отримують лічильник <span class="badge new-posts badge-notification">1</span>, якщо:</p><ul><li>Створена тема</li><li>Відповіли на тему</li><li>Тема прочитана після закінчення 4 хвилин, після її створення</li></ul><p>Чи можна задати свої налаштування відстеження нових тем.</p><p>Перейдіть у свої <a href="%{userPrefsUrl}">налаштування</a>.</p>'
       bottom:
         latest: "Більше немає останніх тем."
-        posted: "There are no more posted topics."
+        posted: "Створених тем більше немає."
         read: "Більше немає прочитаних тем."
         new: "Більше немає нових тем."
         unread: "Більше немає непрочитаних тем."
         category: "Більше немає тем в категорії {{category}}."
-        top: "There are no more top topics."
+        top: "Топових тем більше немає."
+        bookmarks: "Більше немає обраних тем."
     topic:
+      filter_to:
+        one: "%{count} повідомлення в темі"
+        few: "{{count}} повідомлення в темі"
+        many: "{{count}} повідомлень в темі"
+        other: "{{count}} повідомлень в темі"
       create: "Нова тема"
       create_long: "Створити нову тему"
+      open_draft: "Відкрити чернетку"
+      private_message: "Нове приватне повідомлення"
       archive_message:
+        help: "Перемістити повідомлення в архів"
         title: "Архів"
       move_to_inbox:
         title: "Перемістити у Вхідні"
+        help: "Перемістити повідомлення у вхідні"
+      edit_message:
+        help: "Змінити перше повідомлення"
+        title: "Редагувати повідомлення"
       defer:
+        help: "Позначити як непрочитане"
         title: "Відкласти"
       list: "Теми"
       new: "нова тема"
       unread: "непрочитані"
+      new_topics:
+        one: "{{count}} нова тема"
+        few: "{{count}} нових теми"
+        many: "{{count}} нових тем"
+        other: "{{count}} нових тем"
+      unread_topics:
+        one: "{{count}} непрочитана тема"
+        few: "{{count}} непрочитані теми"
+        many: "{{count}} непрочитаних тем"
+        other: "{{count}} непрочитаних тем"
       title: "Тема"
       invalid_access:
         title: "Тема є приватною."
         description: "Вибачте, у Вас немає доступу до цієї теми!"
-        login_required: "You need to log in to see that topic."
+        login_required: "Потрібно увійти для перегляду цієї теми."
       server_error:
         title: "Тему не вдалося завантажити"
         description: "Даруйте, ми не змогли завантажити цю тему, ймовірно, через проблему зі з'єднанням. Будь ласка, спробуйте ще раз. Якщо проблема залишається, дайте нам знати."
       not_found:
         title: "Тему не знайдено"
         description: "Даруйте, ми не змогли знайти цю тему. Можливо, її було видалено модератором?"
+      total_unread_posts:
+        one: "у вас {{count}} непрочитане повідомлення в цій темі"
+        few: "у вас {{count}} непрочитаних повідомлення в цій темі"
+        many: "у вас {{count}} непрочитаних повідомлення в цій темі"
+        other: "у вас {{count}} непрочитаних повідомлення в цій темі"
+      unread_posts:
+        one: "у вас {{count}} непрочитане старе повідомлення в цій теме"
+        few: "у вас {{count}} непрочитаних старих повідомлення в цій темі"
+        many: "у вас {{count}} непрочитаних старих повідомлень в цій темі"
+        other: "у вас {{count}} непрочитаних старих повідомлень в цій темі"
+      new_posts:
+        one: "в цій темі {{count}} нове повідомлення з її останнього перегляду вами"
+        few: "в цій темі {{count}} нові повідомлення з її останнього перегляду вами"
+        many: "в цій темі {{count}} нових повідомлень з її останнього перегляду вами"
+        other: "в цій темі {{count}} нових повідомлень з її останнього перегляду вами"
+      likes:
+        one: "в темі {{count}} лайк"
+        few: "в темі {{count}} лайка"
+        many: "в темі {{count}} лайків"
+        other: "в темі {{count}} лайків"
       back_to_list: "Повернутися до списку тем"
       options: "Налаштування теми"
       show_links: "показати посилання в цій темі"
       toggle_information: "показати/сховати деталі теми"
       read_more_in_category: "Хочете почитати ще? Перегляньте інші теми в {{catLink}} або {{latestLink}}."
       read_more: "Хочете почитати ще? {{catLink}} або {{latestLink}}."
+      group_request: "Вам потрібно надіслати запит на приєднання в групу `{{name}}` щоб побачити цю тему."
+      group_join: "Вам потрібно приєднатися до групи `{{name}}` щоб побачити цю тему."
+      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 {}}"
       browse_all_categories: Переглянути всі категорії
       view_latest_topics: перегляньте останні теми
       suggest_create_topic: "Чому б не створити тему?"
@@ -1415,32 +2021,97 @@ uk:
       jump_reply_down: перейти до пізнішої відповіді
       deleted: "Тему було видалено"
       topic_status_update:
+        title: "Таймер Теми"
+        save: "Встановити Таймер"
+        num_of_hours: "Кількість годин:"
+        remove: "Видалити Таймер"
+        publish_to: "Публікувати в:"
+        when: "Коли:"
+        public_timer_types: Таймер теми
+        private_timer_types: Таймер Тем користувача
         time_frame_required: "Будь ласка, виберіть період часу"
       auto_update_input:
+        none: "Вибір таймфрейма"
+        later_today: "Пізніше сьогодні"
         tomorrow: "Завтра"
+        later_this_week: "Пізніше на цьому тижні"
+        this_weekend: "В ці вихідні"
+        next_week: "На наступному тижні"
+        two_weeks: "Два тижні"
+        next_month: "В наступному місяці"
+        two_months: "Два місяці"
+        three_months: "Три місяці"
+        four_months: "Чотири місяці"
+        six_months: "Шість місяців"
+        one_year: "Один рік"
+        forever: "Назавжди"
+        pick_date_and_time: "Вибрати дату та час"
+        set_based_on_last_post: "Закрити після останнього повідомлення"
+      publish_to_category:
+        title: "Розклад публікації"
+      temp_open:
+        title: "Відкрити на час"
+      auto_reopen:
+        title: "Автоматичне відкриття теми"
+      temp_close:
+        title: "Закрити на час"
       auto_close:
+        title: "Автоматичне закриття теми"
+        label: "Закрити тему через:"
         error: "Будь ласка, введіть коректне значення."
+        based_on_last_post: "Не закривайте, поки останній пост в темі не стане занадто старим."
+      auto_delete:
+        title: "Автоматичне видалення теми"
+      auto_bump:
+        title: "Само-підняття теми"
+      reminder:
+        title: "Нагадати мені"
       status_update_notice:
+        auto_open: "Ця тема автоматично відкриється через %{timeLeft}."
         auto_close: "Ця тема автоматично закриється %{timeLeft}."
+        auto_publish_to_category: "Ця тема буде опублікована в розділі <a href=%{categoryUrl}>#%{categoryName}</a> через %{timeLeft}."
+        auto_close_based_on_last_post: "Ця тема буде закрита через %{duration} після останньої відповіді."
+        auto_delete: "Ця тема буде автоматично видалена через %{timeLeft}."
+        auto_bump: "Ця тема буде автоматично піднята %{timeLeft}."
+        auto_reminder: "Вам прийде нагадування про цю тему через %{timeLeft}."
       auto_close_title: "Налаштування автоматичного закриття"
+      auto_close_immediate:
+        one: "Останнє повідомлення в цій темі відправлено %{count} годину тому, а тому дана тема буде закрита негайно."
+        few: "Останнє повідомлення в цій темі відправлено %{count} години назад, а тому дана тема буде закрита негайно."
+        many: "Останнє повідомлення в цій темі відправлено %{count} годин тому, а тому дана тема буде закрита негайно."
+        other: "Останнє повідомлення в цій темі відправлено %{count} годин тому, а тому дана тема буде закрита негайно."
       timeline:
         back: "Назад"
+        back_description: "Переглянути останнє непрочитане повідомлення"
+        replies_short: "%{current} / %{total}"
       progress:
         title: просування по темі
-        go_bottom: "Кнопка"
+        go_top: "перейти вгору"
+        go_bottom: "перейти вниз"
+        go: "=>"
         jump_bottom: "перейти до останнього допису"
+        jump_prompt: "перейти до..."
+        jump_prompt_of: "з %{count} повідомлень"
+        jump_prompt_long: "Перейти до..."
         jump_bottom_with_number: "перейти до допису %{post_number}"
+        jump_prompt_to_date: "дата"
         jump_prompt_or: "або"
         total: всього дописів
         current: поточний допис
       notifications:
+        title: змінити частоту повідомлень про цю тему
         reasons:
-          "3_10": "Ви отримуватимете сповіщення, тому що слідкуєте за міткою у цій темі."
+          mailing_list_mode: "Ви включили режим поштової розсилки, тому Ви будете отримувати повідомлення про відповіді в цій темі через e-mail."
+          "3_10": "Ви будете отримувати сповіщення, тому що слідкуєте за міткою у цій темі."
           "3_6": "Ви будете отримувати сповіщення, бо Ви слідкуєте за цією категорією."
           "3_5": "Ви будете отримувати сповіщення, бо Ви автоматично почали слідкувати за цією темою."
           "3_2": "Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою."
           "3_1": "Ви будете отримувати сповіщення, бо Ви створили цю тему."
           "3": "Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою."
+          "2_8": "Ви побачите кількість нових відповідей, тому що стежте за цим розділом."
+          "2_4": "Ви побачите кількість нових відповідей, тому що ви розміщували відповідь в цій темі."
+          "2_2": "Ви побачите кількість нових відповідей, тому що стежте за цією темою."
+          "2": 'Ви побачите кількість нових відповідей, тому що <a href="{{basePath}}/u/{{username}}/preferences">читали цю тему</a>.'
           "1_2": "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
           "1": "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
           "0_7": "Ви ігноруєте всі сповіщення у цій категорії."
@@ -1448,12 +2119,16 @@ uk:
           "0": "Ви ігноруєте всі сповіщення з цієї теми."
         watching_pm:
           title: "Слідкувати"
+          description: "Надсилати по кожній відповіді на це повідомлення та показувати лічильник нових непрочитаних відповідей."
         watching:
           title: "Слідкувати"
+          description: "Надсилати по кожному новому повідомленню в цій темі та показувати лічильник нових непрочитаних відповідей."
         tracking_pm:
           title: "Стежити"
+          description: "Кількість непрочитаних повідомлень з’явиться поруч з цим повідомленням. Вам прийде повідомлення, тільки якщо хтось згадає ваш @псевдонім або відповість на ваше повідомлення."
         tracking:
           title: "Стежити"
+          description: "Кількість непрочитаних повідомлень з’явиться поруч з назвою цієї теми. Вам прийде повідомлення, тільки якщо хтось згадає ваш @псевдонім або відповість на ваше повідомлення."
         regular:
           title: "Нормальний"
           description: "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
@@ -1462,19 +2137,33 @@ uk:
           description: "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
         muted_pm:
           title: "Ігнорувати"
+          description: "Ніколи не отримувати повідомлень, пов’язаних з цією розмовою."
         muted:
           title: "Ігнорувати"
+          description: "Не повідомляти про зміни в цій темі та приховати її з останніх."
       actions:
         recover: "Відкликати видалення теми"
         delete: "Видалити тему"
         open: "Відкрити тему"
         close: "Закрити тему"
+        multi_select: "Вибрати повідомлення..."
+        timed_update: "Дія за таймером..."
+        pin: "Закріпити тему..."
+        unpin: "Відмінити закріплення теми..."
         unarchive: "Розархівувати тему"
         archive: "Заархівувати тему"
+        invisible: "Виключити зі списків"
+        visible: "Включити в списки"
         reset_read: "Скинути дані про прочитаність"
+        make_public: "Зробити тему публічною"
+        make_private: "Написати особисте повідомлення"
+        reset_bump_date: "Скинути дату підняття"
       feature:
         pin: "Закріпити тему"
         unpin: "Відкріпити тему"
+        pin_globally: "Закріпити тему глобально"
+        make_banner: "Створити оголошення"
+        remove_banner: "Видалити оголошення"
       reply:
         title: "Відповісти"
         help: "почати складати відповідь на цю тему"
@@ -1483,49 +2172,165 @@ uk:
         help: "Скасувати закріплення цієї теми, щоб вона більше не з'являлася на початку Вашого переліку тем"
       share:
         title: "Поширити"
+        extended_title: "Поділитися посиланням"
         help: "Поширити посилання на цю тему"
       print:
         title: "Друк"
+        help: "Відкрити версію для друку"
       flag_topic:
-        title: "Flag"
-        help: "privately flag this topic for attention or send a private notification about it"
-        success_message: "You successfully flagged this topic."
+        title: "Скарга"
+        help: "поскаржитися на повідомлення"
+        success_message: "Ви поскаржилися на тему."
+      make_public:
+        title: "Перетворити в Публічну тему"
+        choose_category: "Будь ласка, виберіть категорію для публічної теми:"
+      feature_topic:
+        title: "Закріпити цю тему"
+        pin: "Закріпити цю тему вгорі розділу {{categoryLink}} до"
+        confirm_pin: "У вас вже є закріплена тема в розділі ({{count}}). Перебір таких тем може виявитися неприємною незручністю для новачків та анонімних читачів. Ви впевнені, що хочете закріпити ще одну тему в цьому розділі?"
+        unpin: "Скасувати закріплення цієї теми вгорі розділу {{categoryLink}}."
+        unpin_until: "Скасувати закріплення цієї теми вгорі розділу {{categoryLink}} (станеться автоматично <strong>%{until}</strong>)."
+        pin_note: "Користувачі можуть відкріпити тему, кожен сам для себе."
+        pin_validation: "Щоб закріпити цю тему, потрібна дата."
+        not_pinned: "У розділі {{categoryLink}} немає закріплених тем."
+        already_pinned:
+          one: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "Закріпити цю тему вгорі всіх розділів та списків тем до"
+        confirm_pin_globally: "У вас вже є глобально закріплені теми ({{count}}). Перебір таких тем може виявитися неприємним незручністю для новачків та анонімних читачів. Ви впевнені, що хочете глобально закріпити ще одну тему?"
+        unpin_globally: "Скасувати прикріплення цієї теми вгорі всіх розділів та списків тем."
+        unpin_globally_until: "Скасувати прикріплення цієї теми вгорі всіх розділів та списків тем (станеться автоматично <strong>%{until}</strong>)."
+        global_pin_note: "Користувачі можуть відкріпити тему, кожен сам для себе."
+        not_pinned_globally: "Немає глобально закріплених тем."
+        already_pinned_globally:
+          one: "Глобально закріплених тем: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Глобально закріплених тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Глобально закріплених тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Глобально закріплених тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        make_banner: "Перетворити цю тему в оголошення, яке буде відображатися вгорі всіх сторінок."
+        remove_banner: "Прибрати тему-оголошення, яке відображається у верхній частині всіх сторінок."
+        banner_note: "Користувачі можуть закривати оголошення, кожен сам для себе, після чого воно більше не буде для них покиваться. Тільки одна тема може бути зроблена активним оголошенням в будь-який момент часу."
+        no_banner_exists: "Немає поточних тем-оголошень."
+        banner_exists: "На даний момент <strong class='badge badge-notification unread'>вже є</strong> тема-оголошення."
       inviting: "Запрошуємо..."
+      automatically_add_to_groups: "Це запрошення надасть доступ до таких груп:"
       invite_private:
+        title: "Запросити в бесіду"
         email_or_username: "Електронна скринька або ім'я запрошуваного користувача"
         email_or_username_placeholder: "електронна скринька або ім'я користувача"
         action: "Запросити"
+        success: "Ми запросили цього користувача взяти участь в бесіді."
+        success_group: "Ми запросили цю групу взяти участь в бесіді."
         error: "Даруйте, під час запрошення цього користувача сталася помилка."
         group_name: "назва групи"
+      controls: "Управління темою"
       invite_reply:
         title: "Запрошення"
         username_placeholder: "ім'я користувача"
+        action: "Надіслати запрошення"
+        help: "запросити інших в цю тему за допомогою email або повідомлень"
+        to_forum: "Буде відправлено короткого листа, яке дозволить вашому другу приєднатися просто клікнувши на посилання без необхідності входу на сайт."
+        sso_enabled: "Введіть псевдонім користувача, якого ви хочете запросити в цю тему."
+        to_topic_blank: "Введіть псевдонім або email користувача, якого ви хочете запросити в цю тему."
+        to_topic_email: "Ви вказали адресу електронної пошти. Ми відправимо запрошення, яке дозволить вашому другу негайно відповісти в цій темі."
+        to_topic_username: "Ви вказали псевдонім користувача. Ми відправимо йому повідомлення з посиланням, щоб запросити його в цю тему."
+        to_username: "Введіть псевдонім користувача, якого ви хочете запросити в цю тему. Ми відправимо йому повідомлення про те що ви запрошуєте його приєднатися до цієї теми."
         email_placeholder: "електронна скринька"
+        success_email: "Запрошення відправлено за адресою <b>{{emailOrUsername}}</b>. Ми повідомимо Вас, коли цим запрошенням скористаються. Перевірте вкладку Запрошення на вашій сторінці користувача, щоб дізнатися про стан всіх ваших запрошень."
+        success_username: "Ми запросили цього користувача взяти участь в темі."
+        error: "На жаль, ми не змогли запросити цю людину. Можливо, він уже був запрошений? (Запрошення обмежені рейтингом)"
+        success_existing_email: "Користувач з електронною поштою <b>{{emailOrUsername}}</b> вже існує. Ми запросили цього користувача взяти участь в цій темі."
       login_reply: "Увійдіть, щоб відповісти"
       filters:
+        n_posts:
+          one: "{{count}} повідомлення"
+          few: "{{count}} повідомлення"
+          many: "{{count}} повідомлень"
+          other: "{{count}} повідомлень"
         cancel: "Прибрати фільтр"
+      move_to:
+        title: "Перемістити у"
+        action: "перемістити в"
+        error: "При переміщенні поста сталася помилка."
       split_topic:
         title: "Перенесення до нової теми"
         action: "перенести до нової теми"
+        topic_name: "Назва нової теми"
         radio_label: "Нова тема"
         error: "Під час перенесення дописів до нової теми трапилася помилка."
+        instructions:
+          one: "Зараз ви створите нову тему та в неї переміститься вибране вами <b>{{count}}</b> повідомлення."
+          few: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>{{count}}</b> повідомлення."
+          many: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>{{count}}</b> повідомлень."
+          other: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>{{count}}</b> повідомлень."
       merge_topic:
         title: "Перенесення до наявної теми"
         action: "перенести до наявної теми"
         error: "Під час перенесення дописів до цієї теми трапилася помилка."
+        radio_label: "Існуюча тема"
+        instructions:
+          one: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити це <b>{{count}}</b> повідомлення."
+          few: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>{{count}}</b> повідомлення."
+          many: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>{{count}}</b> повідомлень."
+          other: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>{{count}}</b> повідомлень."
       move_to_new_message:
+        title: "Перейти до нового повідомленням"
+        action: "перейти до нового повідомлення"
+        message_title: "Нова тема повідомлення"
         radio_label: "Нове повідомлення"
+        participants: "Учасники"
+        instructions:
+          one: "Ви збираєтеся створити нове повідомлення та заповнити його обраним вами повідомленням."
+          few: "Ви збираєтеся створити нове повідомлення та заповнити його <b>{{count}}</b> повідомленнями, які ви вибрали."
+          many: "Ви збираєтеся створити нове повідомлення та заповнити його <b>{{count}}</b> повідомленнями, які ви вибрали."
+          other: "Ви збираєтеся створити нове повідомлення та заповнити його <b>{{count}}</b> повідомленнями, які ви вибрали."
+      move_to_existing_message:
+        title: "Перейти до існуючого повідомлення"
+        action: "перейти до існуючого повідомлення"
+        radio_label: "Існуюче повідомлення"
+        participants: "Учасники"
+        instructions:
+          one: "Будь ласка, виберіть повідомлення, в яке ви хочете перемістити це повідомлення."
+          few: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>{{count}}</b> повідомлень."
+          many: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>{{count}}</b> повідомлень."
+          other: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>{{count}}</b> повідомлення."
+      merge_posts:
+        title: "З’єднати виділені повідомлення"
+        action: "З’єднати виділені повідомлення"
+        error: "Сталася помилка під час з’єднання виділених повідомлень."
       change_owner:
-        action: "змінити володіння"
+        title: "Змінити Власника"
+        action: "змінити власність"
         error: "Виникла помилка при зміні власника дописів."
         placeholder: "ім'я користувача нового власника"
+        instructions:
+          one: "Будь ласка, виберіть нового власника для повідомлення <b>@{{old_user}}</b>"
+          few: "Будь ласка, виберіть нового власника для повідомлень <b>@{{old_user}}</b>"
+          many: "Будь ласка, виберіть нового власника для повідомлень <b>@{{old_user}}</b>"
+          other: "Будь ласка, виберіть нового власника {{count}} повідомлень для <b>@{{old_user}}</b>"
+      change_timestamp:
+        title: "Змінити часову мітку..."
+        action: "змінити часову мітку"
+        invalid_timestamp: "Тимчасова мітка не може бути в майбутньому"
+        error: "При зміні часової мітки теми виникла помилка"
+        instructions: "Будь ласка, виберіть нову тимчасову мітку. Повідомлення в темі будуть оновлені, щоб прибрати тимчасові відмінності."
       multi_select:
         select: "вибрати"
         selected: "вибрано ({{count}})"
         select_post:
           label: "вибрати"
+          title: "Додати повідомлення в виділення"
+        selected_post:
+          label: "обраний"
+          title: "Натисніть, щоб видалити повідомлення з вибірки"
         select_replies:
           label: "select +replies"
+          title: "Додати запис та всі відповіді для вибору"
+        select_below:
+          label: "вибрати + все нижче"
+          title: "Додати запис та всі відповіді для вибору"
         delete: видалити вибрані
         cancel: скасувати вибір
         select_all: обрати усе
@@ -1535,47 +2340,139 @@ uk:
           few: "Ви обрали дописів: <b>{{count}}</b>."
           many: "Ви обрали дописів: <b>{{count}}</b>."
           other: "Ви обрали дописів: <b>{{count}}</b>."
+      deleted_by_author:
+        one: "(Тема відкликана автором та буде автоматично видалена протягом %{count} години, якщо тільки на повідомлення не надійде скарга)"
+        few: "(Тема відкликана автором та буде автоматично видалена протягом %{count} години, якщо тільки на повідомлення не надійде скарга)"
+        many: "(Тема відкликана автором та буде автоматично видалена протягом %{count} годин, якщо тільки на повідомлення вступить скарга)"
+        other: "(Тема відкликана автором та буде автоматично видалена протягом %{count} годин, якщо тільки на повідомлення вступить скарга)"
     post:
+      quote_reply: "Цитата"
       edit_reason: "Причина: "
       post_number: "допис {{number}}"
+      ignored: "проігнороване зміст"
+      wiki_last_edited_on: "вики редагував"
       last_edited_on: "допис востаннє редаговано"
+      reply_as_new_topic: "Відповісти в новій пов’язаної темі"
+      reply_as_new_private_message: "Відповісти новим повідомленням тем же адресатам"
       continue_discussion: "В продовження дискусії {{postLink}}:"
       follow_quote: "перейти до цитованого допису"
       show_full: "Показати Увесь Допис"
+      show_hidden: "Перегляд ігнорованого вмісту."
+      deleted_by_author:
+        one: "(повідомлення відкликано автором та буде автоматично видалено протягом %{count} години, якщо тільки на повідомлення не надійде скарга)"
+        few: "(повідомлення відкликано автором та буде автоматично видалено протягом %{count} годин, якщо тільки на повідомлення вступить скарга)"
+        many: "(повідомлення відкликано автором та буде автоматично видалено протягом %{count} годин, якщо тільки на повідомлення вступить скарга)"
+        other: "(повідомлення відкликано автором та буде автоматично видалено протягом %{count} годин, якщо тільки на повідомлення вступить скарга)"
+      collapse: "згорнути"
       expand_collapse: "розгорнути/згорнути"
+      locked: "співробітник заблокував це повідомлення для редагування"
+      gap:
+        one: "переглянути {{count}} приховану відповідь"
+        few: "переглянути {{count}} прихованих відповідей"
+        many: "переглянути {{count}} прихованих відповідей"
+        other: "переглянути {{count}} прихованих відповідей"
+      notice:
+        new_user: "Це перша публікація {{user}} - давайте привітаємо його в нашій спільноті!"
+        returning_user: "Минуло багато часу з тих пір, як ми бачили {{user}} - його останній пост був {{time}}."
       unread: "Допис не прочитаний"
+      has_replies:
+        one: "{{count}} відповідь"
+        few: "{{count}} відповіді"
+        many: "{{count}} відповідей"
+        other: "{{count}} відповідей"
+      has_likes_title:
+        one: "Це повідомлення сподобалося {{count}} людині"
+        few: "Це повідомлення сподобалося {{count}} людям"
+        many: "Це повідомлення сподобалося {{count}} людям"
+        other: "Це повідомлення сподобалося {{count}} людям"
+      has_likes_title_only_you: "Вам сподобався цей повідомлення"
+      has_likes_title_you:
+        one: "Вам та ще %{count} людині сподобалося це повідомлення"
+        few: "Вам та ще {{count}} людям сподобалося це повідомлення"
+        many: "Вам та ще {{count}} людям сподобалося це повідомлення"
+        other: "Вам та ще {{count}} людям сподобалося це повідомлення"
       errors:
         create: "Даруйте, під час створення допису трапилася помилка. Будь ласка, спробуйте ще раз."
         edit: "Даруйте, під час редагування допису трапилася помилка. Будь ласка, спробуйте ще раз."
         upload: "Даруйте, під час завантаження цього файлу трапилася помилка. Будь ласка, спробуйте ще раз."
+        file_too_large: "На жаль, цей файл надто великий (максимально допустимий розмір {{max_size_kb}} КБ). Чому б не завантажити цей файл в службу хмарного обміну, а потім поділитися посиланням?"
         too_many_uploads: "Даруйте, але Ви можете одночасно завантажувати тільки один файл."
+        too_many_dragged_and_dropped_files: "Вибачте, ви можете завантажити тільки {{max}} файл."
+        upload_not_authorized: "На жаль, ви не можете завантажити файл даного типу (список дозволених типів файлів: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Даруйте, нові користувачі не можуть завантажувати зображення."
         attachment_upload_not_allowed_for_new_user: "Даруйте, нові користувачі не можуть завантажувати прикріплення."
+        attachment_download_requires_login: "Увійдіть, щоб скачувати прикріплені файли."
+      abandon_edit:
+        confirm: "Ви впевнені, що хочете скасувати свої зміни?"
+        no_value: "Ні, зачекайте"
+        no_save_draft: "Ні, зберегти чернетку"
+        yes_value: "Так, скасувати зміни"
       abandon:
         confirm: "Ви впевнені, що хочете облишити цей допис?"
         no_value: "Ні, зачекайте"
+        no_save_draft: "Ні, зберегти чернетку"
         yes_value: "Так, облишити"
+      via_email: "це повідомлення прийшло з пошти"
+      via_auto_generated_email: "це повідомлення прийшло з автоматично згенерованого e-mail"
+      whisper: "Це внутрішнє повідомлення, тобто воно видно тільки модераторам"
+      wiki:
+        about: "це вікі-повідомлення"
       archetypes:
         save: "Зберегти налаштування"
+      few_likes_left: "Дякуємо, що ділитеся любов’ю. На сьогодні у Вас залишилося кілька лайків."
       controls:
         reply: "почати складати відповідь на цей допис"
         like: "вподобати цей допис"
         has_liked: "Вам сподобався цей допис"
+        read_indicator: "користувачі, які читають цей пост"
         undo_like: "прибрати вподобання"
         edit: "редагувати цей допис"
         edit_action: "Редагувати"
+        edit_anonymous: "Увійдіть, щоб відредагувати це повідомлення."
         flag: "приватно поскаржитися на цей допис"
         delete: "видалити цей допис"
         undelete: "скасувати видалення цього допису"
         share: "поширити посилання на цей допис"
         more: "Більше"
         delete_replies:
+          confirm: "Ви також хочете видалити відповіді на цей пост?"
+          direct_replies:
+            one: "Так, та %{count} пряму відповідь"
+            few: "Так, та {{count}} прямих відповідей"
+            many: "Так, та {{count}} прямих відповідей"
+            other: "Так, та {{count}} пряму відповідь"
+          all_replies:
+            one: "Так, та %{count} відповідь"
+            few: "Так, та всі {{count}} відповіді"
+            many: "Так, та всі {{count}} відповіді"
+            other: "Так, та всі {{count}} відповіді"
           just_the_post: "Ні, тільки цей допис"
+        admin: "дії адміністратора над повідомленням"
+        wiki: "Зробити вікі-повідомленням"
+        unwiki: "Скасувати вікі-повідомлення"
+        convert_to_moderator: "Додати колір модератора"
+        revert_to_regular: "Прибрати колір модератора"
         rebake: "Перебудувати HTML"
+        unhide: "Знову зробити видимим"
+        change_owner: "Змінити власність"
         grant_badge: "Надати Значок"
+        lock_post: "Заморозити повідомлення"
+        lock_post_description: "заборонити автору редагувати цей пост"
+        unlock_post: "Розморозити повідомлення"
+        unlock_post_description: "Дозволити автору редагувати цей пост"
+        delete_topic_disallowed_modal: "У вас немає дозволу на видалення цієї теми. Якщо ви дійсно хочете, щоб вона була видалена, використовуйте функцію прапора модератору разом з аргументацією."
+        delete_topic_disallowed: "у вас немає дозволу на видалення цієї теми"
         delete_topic: "видалити тему"
+        add_post_notice: "Додати повідомлення модератору"
+        remove_post_notice: "Видалити повідомлення модератору"
+        remove_timer: "скасувати таймер"
       actions:
         flag: "Поскаржитися"
+        defer_flags:
+          one: "Ігнорувати скаргу"
+          few: "ігнорувати скарги"
+          many: "ігнорувати скарги"
+          other: "ігнорувати скарги"
         undo:
           off_topic: "Відкликати скаргу"
           spam: "Відкликати скаргу"
@@ -1583,19 +2480,39 @@ uk:
           bookmark: "Скасувати закладку"
           like: "Скасувати вподобання"
         people:
-          off_topic: "flagged this as off-topic"
+          off_topic: "це позначено як поза темою"
           spam: "flagged this as spam"
           inappropriate: "flagged this as inappropriate"
           notify_moderators: "notified moderators"
           notify_user: "надіслати повідомлення"
+          bookmark: "Додати закладку"
           like: "liked this"
+          read: "читати це"
+          like_capped:
+            one: "та {{count}} сподобалося"
+            few: "і {{count}} іншим сподобалося"
+            many: "і {{count}} іншим сподобалося"
+            other: "і {{count}} іншим сподобалося"
         by_you:
           off_topic: "Ви поскаржилися на це як на недотичне до теми"
           spam: "Ви поскаржилися на це як на спам"
           inappropriate: "Ви поскаржилися на це як на неприпустиме"
           notify_moderators: "Ви позначили допис для модерації"
+          notify_user: "Ви відправили повідомлення цьому користувачеві"
           bookmark: "Ви лишили тут закладку"
           like: "Ви це вподобали"
+      delete:
+        confirm:
+          one: "Ви впевнені, що хочете видалити це повідомлення?"
+          few: "Ви впевнені, що хочете видалити {{count}} повідомлення?"
+          many: "Ви впевнені, що хочете видалити {{count}} повідомлень?"
+          other: "Ви впевнені, що хочете видалити {{count}} повідомлень?"
+      merge:
+        confirm:
+          one: "Ви впевнені, що хочете об’єднати ці повідомлення?"
+          few: "Are you sure you want to merge those {{count}} posts?"
+          many: "Are you sure you want to merge those {{count}} posts?"
+          other: "Are you sure you want to merge those {{count}} posts?"
       revisions:
         controls:
           first: "Перша версія"
@@ -1604,36 +2521,68 @@ uk:
           last: "Остання версія"
           hide: "Приховати версію"
           show: "Показати версію"
+          revert: "Відкат до цієї версії"
+          edit_wiki: "редагувати Wiki"
+          edit_post: "редагувати запис"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
             title: "Показати результат виведення зі змінами на місці"
+            button: "HTML"
           side_by_side:
             title: "Показати бік-о-бік результати виведення"
+            button: "HTML"
+          side_by_side_markdown:
+            title: "Показати відмінності редакцій пліч-о-пліч"
+            button: "Необроблений"
+      raw_email:
+        displays:
+          raw:
+            title: "Показати вихідний лист"
+            button: "Джерело"
+          text_part:
+            title: "Показати текстову версію листа"
+            button: "Текст"
+          html_part:
+            title: "Показати HTML версію листа"
+            button: "HTML"
     category:
       can: "може&hellip; "
       none: "(без категорії)"
       all: "Всі категорії"
+      choose: "категорії &hellip;"
       edit: "Редагувати"
+      edit_dialog_title: "Редагувати:%{categoryName}"
       view: "Переглянути теми, що належать до категорії"
       general: "Основне"
       settings: "Налаштування"
+      topic_template: "Шаблон теми"
       tags: "Мітки"
       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: "Також дозволити інші мітки"
+      tag_group_selector_placeholder: "(Необов’язково) Група тегів"
+      required_tag_group_description: "Потрібні нові теми, щоб мати теги з групи тегів:"
+      min_tags_from_required_group_label: 'Кількість тегів:'
+      required_tag_group_label: "Група тегів:"
+      topic_featured_link_allowed: "Дозволити популярні посилання в цій категорії"
       delete: "Видалити категорію"
       create: "Нова категорія"
       create_long: "Створити категорію"
       save: "Зберегти категорію"
+      slug: "Посилання на розділ"
+      slug_placeholder: "(Опція) дефіси в url"
       creation_error: Під час створення категорії трапилася помилка.
       save_error: Під час збереження категорії трапилася помилка.
       name: "Назва категорії"
       description: "Опис"
       topic: "тема категорії"
+      logo: "Логотип розділу"
+      background_image: "Фонове зображення розділу"
       badge_colors: "Кольори значка"
       background_color: "Колір тла"
       foreground_color: "Колір тексту"
@@ -1642,84 +2591,225 @@ uk:
       delete_confirm: "Ви впевнені, що хочете видалити цю категорію?"
       delete_error: "Під час видалення категорії трапилася помилка."
       list: "List Categories"
+      no_description: "Будь ласка, додайте опис для цього розділу."
       change_in_category_topic: "Редагувати опис"
       already_used: "Цей колір вже використовується іншою категорією"
       security: "Безпека"
+      special_warning: "Увага: даний розділ був встановлений та налаштування безпеки не можуть бути змінені. Якщо не хочете використовувати цей розділ, видаліть його замість зміни."
+      uncategorized_security_warning: "Ця категорія особлива. Він призначений для зберігання тем, які не мають категорії; у нього не може бути налаштувань безпеки."
+      uncategorized_general_warning: 'Ця категорія особлива. Він використовується в якості категорії за замовчуванням для нових тем, для яких не обрана категорія. Якщо ви хочете запобігти таку поведінку та примусово вибрати категорію, вимкніть настройку тут</a>. Якщо ви хочете змінити ім’я або опис, перейдіть до <a href="%{customizeLink}"> Налаштувати / текстовий вміст</a>.'
+      pending_permission_change_alert: "Ви не додали %{group} в цю категорію; натисніть цю кнопку, щоб додати їх."
       images: "Зображення"
       email_in: "Custom incoming email address:"
+      email_in_allow_strangers: "Приймати листи від анонімних користувачів без облікових записів"
+      email_in_disabled: "Створення нових тем через електронну пошту відключено в налаштуваннях сайту. Щоб дозволити створення нових тем через електронну пошту,"
+      email_in_disabled_click: 'активуйте налаштування "email in".'
+      mailinglist_mirror: "Категорія відображає список розсилки"
+      suppress_from_latest: "Приховати категорію з останніх тем."
+      show_subcategory_list: "Показувати список підрозділів над списком тем в цьому розділі."
+      num_featured_topics: "Кількість тем на сторінці розділів"
+      subcategory_num_featured_topics: "Кількість обраних тем на сторінці батьківської категорії:"
+      all_topics_wiki: "Створення нових тем Wikis за замовчуванням"
+      subcategory_list_style: "Стиль списку підрозділів:"
+      sort_order: "Порядок сортування тем:"
+      default_view: "Вид списку тем за умовчанням:"
+      default_top_period: "Верхній період за замовчуванням:"
       allow_badges_label: "Дозволити нагороджувати значками у цій категорії"
       edit_permissions: "Редагувати дозволи"
+      reviewable_by_group: "Крім персоналу, пости та прапори в цій категорії також можуть бути розглянуті:"
       review_group_name: "назва групи"
+      require_topic_approval: "З них потребують схвалення модератором всіх нових тем"
+      require_reply_approval: "З них потребують схвалення модератором всіх нових відповідей"
       this_year: "цього року"
+      position: "Позиція на сторінці категорії:"
       default_position: "Default Position"
+      position_disabled: "Розділи будуть показані в порядку активності. Щоб налаштувати порядок розділів,"
+      position_disabled_click: 'включите налаштування "fixed category positions".'
       minimum_required_tags: "Мінімальна кількість міток, необхідна у темі:"
       parent: "Батьківська категорія"
+      num_auto_bump_daily: "Кількість відкритих тем для автоматичного підняття щодня:"
+      navigate_to_first_post_after_read: "Перейдіть до першого повідомлення після прочитання тем"
       notifications:
         watching:
           title: "Слідкувати"
+          description: "Спостерігати за всіма темами цього розділу. Повідомляти про кожне нове повідомленні в будь-який з часом та показувати лічильник нових відповідей."
         watching_first_post:
           title: "Слідкувати за першим дописом"
+          description: "Ви будете повідомлені про нові теми в цій категорії, але не на відповіді в них."
         tracking:
           title: "Стежити"
+          description: "Відстежувати всі теми цього розділу. Повідомляти якщо хтось згадає ваше @name або відповість вам, показувати лічильник нових відповідей."
         regular:
           title: "Нормальний"
           description: "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
         muted:
           title: "Ігноровані"
+          description: "Не повідомляти про нові теми в цьому розділі та приховати їх з останніх."
       search_priority:
+        label: "Пріоритет Пошуку"
         options:
           normal: "Нормальний"
           ignore: "Ігнорувати"
+          very_low: "Дуже низький"
+          low: "Низький"
           high: "Високий"
+          very_high: "Дуже високий"
       sort_options:
         default: "типово"
         likes: "Вподобання"
+        op_likes: "Кількість симпатій у першого повідомлення"
         views: "Перегляди"
         posts: "Дописи"
         activity: "Активність"
+        posters: "Кількість учасників"
         category: "Категорія"
         created: "Створено"
+      sort_ascending: "По зростанню"
+      sort_descending: "За зменшенням"
+      subcategory_list_styles:
+        rows: "Рядки"
+        rows_with_featured_topics: "Рядки з обговорюваних тем"
+        boxes: "Блоки"
+        boxes_with_featured_topics: "Блоки з обговорюваних тем"
       settings_sections:
         general: "Основне"
+        moderation: "Модерація"
+        appearance: "Зовнішній вигляд"
         email: "Електронна пошта"
     flagging:
+      title: "Дякую за вашу допомогу в підтримці порядку!"
       action: "Поскаржитися на допис"
       take_action: "Вжити заходів"
       notify_action: "Повідомлення"
+      official_warning: "Офіційне попередження"
       delete_spammer: "Видалити спамера"
+      delete_confirm_MF: "Ви збираєтеся видалити {POSTS, plural, one {<b>1</b> повідомлення} other {<b>#</b> повідомлень}} та {TOPICS, plural, one {<b>1</b> тему} other {<b>#</b> теми}} цього користувача, а також видалити його обліковий запис, додати його IP адресу <b>{ip_address}</b> та його поштову адресу <b>{email}</b> в чорный список. Ви дійсно впевнені, що ваші помисли чисті та дії не продиктовані гнівом?"
       yes_delete_spammer: "Так, видалити спамера"
+      ip_address_missing: "(не доступно)"
       hidden_email_address: "(приховано)"
+      submit_tooltip: "Надіслати приватну скаргу"
+      take_action_tooltip: "Зімітувати досягнення порогу кількості скарг, не чекаючи їх від спільноти"
       cant: "Даруйте, зараз Ви не можете поскаржитися на цей допис."
+      notify_staff: "Повідомити модератора приватно"
+      formatted_name:
+        off_topic: "Це не по темі"
+        inappropriate: "Це не прийнятно"
+        spam: "Це спам"
+      custom_placeholder_notify_user: "Будьте точні, конструктивні та доброзичливі."
+      custom_placeholder_notify_moderators: "Поясніть суть проблеми: на що нам слід звернути увагу. Надайте відповідні посилання, якщо це можливо."
+      custom_message:
+        at_least:
+          one: "Введіть хоча б%{count} символ"
+          few: "Введіть хоча б {{count}} символу"
+          many: "Введіть хоча б {{count}} символів"
+          other: "Введіть хоча б {{count}} символів"
+        more:
+          one: "Ще %{count} символ..."
+          few: "Ще хоча б {{count}} символу..."
+          many: "Ще хоча б {{count}} символів..."
+          other: "Ще хоча б {{count}} символів..."
+        left:
+          one: "Залишилося не більше %{count} символу"
+          few: "Залишилося не більше {{count}} символів"
+          many: "Залишилося не більше {{count}} символів"
+          other: "Залишилося не більше {{count}} символів"
     flagging_topic:
-      action: "Flag Topic"
+      title: "Дякую за допомогу в підтримці порядку!"
+      action: "Поскаржитись на тему"
       notify_action: "Повідомлення"
     topic_map:
       title: "Підсумок теми"
+      participants_title: "Часті автори"
+      links_title: "Популярні посилання"
+      links_shown: "показати більше посилань..."
+      clicks:
+        one: "%{count} клік"
+        few: "%{count} кліка"
+        many: "%{count} кліків"
+        other: "%{count} кліків"
+    post_links:
+      about: "покази"
+      title:
+        one: "ще %{count}"
+        few: "ще %{count}"
+        many: "ще %{count}"
+        other: "ще %{count}"
     topic_statuses:
+      warning:
+        help: "Це офіційне попередження."
+      bookmarked:
+        help: "Вы додали тему в закладки "
       locked:
         help: "цю тему закрито; нові відповіді більше не приймаються"
       archived:
         help: "цю тему заархівовано; вона заморожена і її не можна змінити"
+      locked_and_archived:
+        help: "Тема закрита та заархівувати; в ній більше не можна відповідати вона більше не може бути змінена"
       unpinned:
         title: "Не закріплені"
+        help: "Ця тема для вас відкріплений; вона буде відображатися в звичайному порядку"
+      pinned_globally:
+        title: "закріплена глобально"
+        help: "Ця тема закріплена глобально; вона буде відображатися вгорі як на головній, так та в своєму розділі"
       pinned:
         title: "Закріплені"
+        help: "Ця тема для вас закріплена; вона буде показана вгорі свого розділу"
+      unlisted:
+        help: "Тема виключена з усіх списків тем та доступна тільки за прямим посиланням"
+      personal_message:
+        title: "Ця тема є особистим повідомленням"
     posts: "Дописи"
     posts_long: "тема містить {{number}} дописів"
+    posts_likes_MF: |
+      В цій темі {count, plural, one {1 повідомлення} other {# повідомлень}} {ratio, select,
+      low {з високим рейтингом симпатій}
+      med {з дуже високим рейтингом симпатій}
+      high {з надзвичайно високим рейтингом симпатій}
+      other {}}
     original_post: "Перший допис"
     views: "Перегляди"
+    views_lowercase:
+      one: "перегляд"
+      few: "переглядів"
+      many: "переглядів"
+      other: "переглядів"
     replies: "Відповіді"
+    views_long:
+      one: "тема переглянута%{count} раз"
+      few: "тема переглянута {{number}} рази"
+      many: "тема переглянута {{number}} раз"
+      other: "тема переглянута {{number}} раз"
     activity: "Активність"
     likes: "Вподобання"
+    likes_lowercase:
+      one: "симпатія"
+      few: "симпатій"
+      many: "симпатій"
+      other: "симпатій"
     likes_long: "в цій темі {{number}} вподобань"
     users: "Користувачі"
+    users_lowercase:
+      one: "користувач"
+      few: "користувача"
+      many: "користувача"
+      other: "користувача"
     category_title: "Категорія"
     history: "Історія"
     changed_by: "{{author}}"
+    raw_email:
+      title: "Вхідне повідомлення"
+      not_available: "Не доступно!"
     categories_list: "Список категорій"
     filters:
+      with_topics: "%{filter} теми"
+      with_category: "%{filter}%{category} теми"
       latest:
         title: "Останні"
+        title_with_count:
+          one: "Останні (%{count})"
+          few: "Останні ({{count}})"
+          many: "Останні ({{count}})"
+          other: "Останні ({{count}})"
         help: "теми з найсвіжішими дописами"
       read:
         title: "Прочитані"
@@ -1730,19 +2820,48 @@ uk:
         help: "всі теми, згруповані за категоріями"
       unread:
         title: "Непрочитані"
+        title_with_count:
+          one: "Непрочитані ({{count}})"
+          few: "Непрочитані ({{count}})"
+          many: "Непрочитані ({{count}})"
+          other: "Непрочитані ({{count}})"
+        help: "спостерігаються або відслідковують теми з непрочитаними повідомленнями"
+        lower_title_with_count:
+          one: "{{count}} непрочитана"
+          few: "{{count}} непрочитаних"
+          many: "{{count}} непрочитаних"
+          other: "{{count}} непрочитаних"
       new:
+        lower_title_with_count:
+          one: "{{count}} нова"
+          few: "{{count}} нових"
+          many: "{{count}} нових"
+          other: "{{count}} нових"
         lower_title: "new"
         title: "Новий"
+        title_with_count:
+          one: "Нові ({{count}})"
+          few: "Нові ({{count}})"
+          many: "Нові ({{count}})"
+          other: "Нові ({{count}})"
+        help: "теми, створені за останні кілька днів"
       posted:
         title: "Мої дописи"
         help: "теми, в які Ви дописували"
       bookmarks:
         title: "Закладки"
+        help: "теми, які ви додали в закладки"
       category:
         title: "{{categoryName}}"
+        title_with_count:
+          one: "{{categoryName}} ({{count}})"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "Останні теми в категорії {{categoryName}}"
       top:
         title: "Top"
+        help: "Найактивніші теми за останній рік, місяць, квартал, тиждень або день"
         all:
           title: "Весь час"
         yearly:
@@ -1761,28 +2880,71 @@ uk:
         this_month: "Місяць"
         this_week: "Тиждень"
         today: "Today"
+        other_periods: "показати найбільш обговорювані"
+    browser_update: 'На жаль, <a href="https://www.discourse.org/faq/#browser">ваш браузер застарів та не підтримується цим сайтом</a>. Будь ласка, <a href="https://browsehappy.com">поновіть браузер</a>.'
     permission_types:
       full: "Створювати / Відповідати / Бачити"
       create_post: "Відповідати / Бачити"
       readonly: "Бачити"
     lightbox:
       download: "завантажити"
+      previous: "Попередній (клавіша зі стрілкою вліво)"
+      next: "Наступний (клавіша зі стрілкою вправо)"
+      counter: "%curr% з %total%"
+      close: "Закрити (Esc)"
+      content_load_error: '<a href="%url%">Вміст</a> не вдалося завантажити.'
+      image_load_error: '<a href="%url%">Зображення</a> не вдалося завантажити.'
     keyboard_shortcuts_help:
+      shortcut_key_delimiter_comma: ", "
+      shortcut_key_delimiter_plus: "+"
+      shortcut_delimiter_or: "%{shortcut1} або %{shortcut2}"
+      shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
+      shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "Поєднання клавіш"
       jump_to:
         title: "Перейти до"
+        home: "%{shortcut} Головна"
+        latest: "%{shortcut} Останні"
+        new: "%{shortcut} Нові"
+        unread: "%{shortcut} Непрочитані"
         categories: "%{shortcut} Категорії"
+        top: "%{shortcut} Обговорювані"
+        bookmarks: "%{shortcut} Закладки"
+        profile: "%{shortcut} Профіль"
+        messages: "%{shortcut} Особисті повідомлення"
+        drafts: "%{shortcut} Чернетки"
       navigation:
         title: "Навігація"
+        jump: "%{shortcut} Перейти до повідомлення №"
         back: "%{shortcut} Назад"
+        up_down: "%{shortcut} Рухати курсор виділення теми &uarr; &darr;"
         open: "%{shortcut} Відкрити обрану тему"
+        next_prev: "%{shortcut} Наступна/попередня секція"
+        go_to_unread_post: "%{shortcut} Перейти до першого непрочитаного повідомлення"
       application:
         title: "Застосунок"
         create: "%{shortcut} Створити нову тему"
         notifications: "%{shortcut} Відкрити сповіщення"
+        hamburger_menu: "%{shortcut} Відкрити меню гамбургер"
+        user_profile_menu: "%{shortcut} Відкрити меню профілю"
+        show_incoming_updated_topics: "%{shortcut} Показати оновлені теми"
+        search: "%{shortcut} Пошук"
+        help: "%{shortcut} Показати поєднання клавіш"
+        dismiss_new_posts: "%{shortcut} Відкласти нові повідомлення"
+        dismiss_topics: "%{shortcut} Відкласти теми"
+        log_out: "%{shortcut} Вийти"
+      composing:
+        title: "Редагування"
+        return: "%{shortcut} Повернутися в редактор"
+        fullscreen: "%{shortcut} Повноекранний редактор"
       actions:
         title: "Дії"
+        bookmark_topic: "%{shortcut} Додати/видалити з заклодок"
+        pin_unpin_topic: "%{shortcut} Закріпити/Відкріпити теми"
+        share_topic: "%{shortcut} Поділитися темою"
         share_post: "%{shortcut} Поширити допис"
+        reply_as_new_topic: "%{shortcut} Відповісти в новій пов’язаній темі"
+        reply_topic: "%{shortcut} Відповісти в темі"
         reply_post: "%{shortcut} Відповісти на допис"
         quote_post: "%{shortcut} Цитувати допис"
         like: "%{shortcut} Вподобати допис"
@@ -1791,11 +2953,43 @@ uk:
         edit: "%{shortcut} Редагувати допис"
         delete: "%{shortcut} Видалити допис"
         mark_muted: "%{shortcut} Ігнорувати сповіщення з теми"
+        mark_regular: "%{shortcut} Стандартні повідомлення в темі (по-замовчуванню)"
         mark_tracking: "%{shortcut} Стежити за темою"
+        mark_watching: "%{shortcut} Спостерігати за темою"
+        print: "%{shortcut} Друкувати тему"
+        defer: "%{shortcut} Відкласти тему"
     badges:
+      earned_n_times:
+        one: "Заробив цю нагороду %{count} раз"
+        few: "Заробили цю нагороду %{count} раз"
+        many: "Заробили цю нагороду %{count} раз"
+        other: "Заробили цю нагороду %{count} раз"
+      granted_on: "Видана %{date}"
+      others_count: "Інші з цією нагородою (%{count})"
       title: Значки
+      allow_title: "Ви можете использовать эту нагороду в качестве титула."
+      multiple_grant: "Ви можете получить её несколько раз"
+      badge_count:
+        one: "%{count} нагорода"
+        few: "%{count} нагорода"
+        many: "%{count} нагорода"
+        other: "%{count} нагорода"
+      more_badges:
+        one: "ще + %{count}"
+        few: "+ ще %{count}"
+        many: "+ ще %{count}"
+        other: "+ ще %{count}"
+      granted:
+        one: "видано %{count}"
+        few: "видано %{count}"
+        many: "видано %{count}"
+        other: "видано %{count}"
       select_badge_for_title: "Оберіть значок, що буде вашим званням"
+      none: "(немає)"
+      successfully_granted: "Нагорода %{badge} успішно присвоєна %{username}"
       badge_grouping:
+        getting_started:
+          name: Початок роботи
         community:
           name: Спільнота
         trust_level:
@@ -1804,6 +2998,15 @@ uk:
           name: Інше
         posting:
           name: Опублікування
+    google_search: |
+      <h3>Пошук за допомогою Google</h3>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
     tagging:
       all_tags: "Усі мітки"
       other_tags: "Інші мітки"
@@ -1822,6 +3025,7 @@ uk:
       rename_tag: "Перейменувати мітку"
       rename_instructions: "Виберіть нову назву для мітки:"
       sort_by: "Сортувати за:"
+      sort_by_count: "Кількість"
       sort_by_name: "ім'я"
       manage_groups: "Керувати групами міток"
       manage_groups_description: "Визначити групи для організації міток"
@@ -1859,6 +3063,7 @@ uk:
           description: "Ви будете автоматично стежити за всіма темами з цією міткою. Поруч з темою показуватиметься кількість непрочитаних і нових дописів."
         regular:
           title: "Звичайний"
+          description: "Повідомляти, тільки якщо хтось згадає мене по @псевдоніму, або відповість на моє повідомлення."
         muted:
           title: "Ігнорувати"
           description: "Ви не будете отримувати жодних сповіщень про нові теми з цією міткою, і вони не з'являтимуться у вкладці Непрочитані."
@@ -1869,29 +3074,42 @@ uk:
         tags_label: "Мітки у цій групі:"
         tags_placeholder: "мітки"
         parent_tag_label: "Батьківська мітка:"
+        parent_tag_placeholder: "Опціонально"
         parent_tag_description: "Мітки з цієї групи не можуть бути використані, якщо немає батьківської мітки."
         one_per_topic_label: "Обмежити до однієї мітки з цієї групи на тему"
         new_name: "Нова група міток"
+        name_placeholder: "Назва групи тегів"
         save: "Зберегти"
         delete: "Видалити"
         confirm_delete: "Ви впевнені, що хочете вилучити цю групу міток?"
         everyone_can_use: "Мітки може використовувати будь-хто"
         usable_only_by_staff: "Мітки видимі для всіх, але лише працівники можуть їх використовувати"
-        visible_only_to_staff: "Мітки видимі лише працівникам"
+        visible_only_to_staff: "Мітки видимі лише персоналу"
       topics:
         none:
           unread: "У Вас немає непрочитаних тем."
           new: "У Вас немає нових тем."
           read: "Ви ще не прочитали жодної теми."
           posted: "Ви ще не дописували в жодну тему."
-          top: "There are no top topics."
+          latest: "Немає останніх тем."
+          bookmarks: "У вас поки немає тем в закладках."
+          top: "Топових тем немає."
         bottom:
           latest: "Більше немає останніх тем."
-          posted: "There are no more posted topics."
+          posted: "Більше немає опублікованих тем."
           read: "Більше немає прочитаних тем."
           new: "Більше немає нових тем."
           unread: "Більше немає непрочитаних тем."
-          top: "There are no more top topics."
+          top: "Топових тем більше немає."
+          bookmarks: "Більше немає тем в закладках."
+    invite:
+      custom_message: "Зробити запрошення трохи більш особистим, написавши <a href> повідомлення користувачеві</a>."
+      custom_message_placeholder: "Напишіть сюди ваше особисте повідомлення"
+      custom_message_template_forum: "Вітання. Подумав, що тобі буде цікаво зареєструватися на цьому форумі!"
+      custom_message_template_topic: "Вітання! Подумав, що тебе може зацікавити ця тема!"
+    forced_anonymous: "Через надмірне навантаження, це тимчасово показується всім, як якщо б користувач вийшов з системи."
+    safe_mode:
+      enabled: "Включено безпечний режим, щоб вийти з безпечного режиму, закрийте поточне вікно браузера"
   admin_js:
     type_to_filter: "введіть, щоб фільтрувати..."
     admin:
@@ -1902,8 +3120,12 @@ uk:
           always: "завжди"
           only_muted: "при використанні самостійно чи з іншими знемовленими тегами"
           never: "ніколи"
+      reports:
+        title: "Список доступних звітів"
       dashboard:
         title: "Майстерня"
+        last_updated: "Приладова панель оновлена:"
+        discourse_last_updated: "Discourse оновлений:"
         version: "Версія"
         up_to_date: "У вас остання версія!"
         critical_available: "Доступне критичне оновлення."
@@ -1914,20 +3136,50 @@ uk:
         version_check_pending: "Здається, Ви нещодавно здійснили оновлення. Чудово!"
         installed_version: "Встановлена"
         latest_version: "Остання"
+        problems_found: "Кілька порад по вашим поточним налаштуванням сайту"
         last_checked: "Остання перевірка"
         refresh_problems: "Оновити"
         no_problems: "Не виявлено жодних проблем."
         moderators: "Модератори:"
         admins: "Адміни:"
+        silenced: "Відключені:"
         suspended: "Призупинені:"
         private_messages_short: "Пвдмл"
         private_messages_title: "Повідомлення"
+        mobile_title: "Мобільний"
+        space_used: "%{usedSize} використано"
+        space_used_and_free: "%{usedSize} (%{freeSize} вільно)"
+        uploads: "Завантажити"
         backups: "Backups"
+        backup_count:
+          one: "%{count} резервна копія @ %{location}"
+          few: "%{count} резервні копії @ %{location}"
+          many: "%{count} резервні копії @ %{location}"
+          other: "%{count} резервні копії @ %{location}"
+        lastest_backup: "Останні:%{date}"
         traffic_short: "Трафік"
+        traffic: "Трафік (веб-запити)"
+        page_views: "Переглядів сторінок"
+        page_views_short: "Переглядів"
+        show_traffic_report: "Розширений звіт по трафіку"
+        community_health: Стан спільноти
+        moderators_activity: Активність модераторів
+        whats_new_in_discourse: "Що нового в Discourse?"
+        activity_metrics: Метрики активності
+        all_reports: "Всі звіти"
         general_tab: "Основне"
+        moderation_tab: "Модерація"
         security_tab: "Безпека"
+        reports_tab: "Звіти"
         report_filter_any: "будь-який"
+        disabled: Відключено
+        timeout_error: "Вибачте, запит займає надто багато часу. Будь ласка, виберіть коротший інтервал"
+        exception_error: "Вибачте, сталася помилка при виконанні запиту"
+        too_many_requests: "Ви виконуєте цю дію занадто часто. Будь ласка, зачекайте, перш ніж намагатися знову."
+        not_found_error: "Вибачте, цього звіту не існує"
+        filter_reports: Фільтр звітів
         reports:
+          trend_title: "%{percent} зміни. В даний час %{current}, було %{prev} в попередні періоди."
           today: "Сьогодні"
           yesterday: "Вчора"
           last_7_days: "Останні 7"
@@ -1936,7 +3188,23 @@ uk:
           7_days_ago: "7 днів тому"
           30_days_ago: "30 днів тому"
           all: "Все"
+          view_table: "Таблиця"
+          view_graph: "Графік"
+          refresh_report: "Оновити звіт"
+          start_date: "Дата початку (UTC)"
+          end_date: "Дата закінчення (UTC)"
+          groups: "Усі групи"
+          disabled: "Цей звіт відключено"
+          totals_for_sample: "Підсумки по вибірці"
+          average_for_sample: "Середнє для вибірки"
+          total: "Всього за весь час"
+          no_data: "Немає даних для відображення."
+          trending_search:
+            more: '<a href="%{basePath}/admin/logs/search_logs">Пошукові логи</a>'
+            disabled: 'Звіт про пошукові запити відключено. Включити <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">журнал пошукових запитів</a> для збору даних.'
           filters:
+            file-extension:
+              label: Розширення файлу
             group:
               label: Група
             category:
@@ -1948,14 +3216,45 @@ uk:
         new:
           title: "Нова група"
           create: "Створити"
+          name:
+            too_short: "Занадто коротке ім’я групи"
+            too_long: "Занадто довге ім’я групи"
+            checking: "Перевірка доступності імені групи..."
+            available: "Назва групи є"
+            not_available: "Назва групи недоступно"
+            blank: "Ім’я групи не може бути порожнім"
+        bulk_add:
+          title: "Масове додавання в групу"
+          complete_users_not_added: "Ці користувачі не були додані (переконайтеся, що у них є обліковий запис):"
+          paste: "Вставити список імен користувачів або e-mail, по одному в рядку:"
+        add_members:
+          as_owner: "Встановити користувача (їй) в якості власника (ів) цієї групи"
         manage:
           interaction:
             email: Електронна пошта
+            incoming_email: "Спеціальна вхідна адреса e-mail"
+            incoming_email_placeholder: "введіть e-mail адресу"
+            visibility: Видимість
             visibility_levels:
+              title: "Хто може бачити цю групу?"
               public: "Усі"
+              logged_on_users: "Зареєстровані користувачі"
+              members: "Власники групи, учасники"
+              staff: "Власники групи та персонал"
+              owners: "Власники групи"
+              description: "Адміністратори можуть бачити всі групи."
+            members_visibility_levels:
+              title: "Хто може бачити учасників цієї групи?"
+              description: "Адміністратори можуть бачити учасників усіх груп."
+            publish_read_state: "У повідомленнях групи публікують стан читання групи"
           membership:
             automatic: Автоматичні
-            trust_level: Рівень довіри
+            trust_levels_title: "Рівень довіри, автоматично присвоюється учасникам при їх додаванні:"
+            effects: Ефекти
+            trust_levels_none: "Відсутня"
+            automatic_membership_email_domains: "Користувачі, зареєстровані c адресою електронної пошти, яка точно збігається з доменом в цьому списку, будуть автоматично додані до цієї групи: "
+            automatic_membership_retroactive: "Застосуйте те ж правило домену e-mail, щоб додати існуючих зареєстрованих користувачів."
+            primary_group: "Автоматично встановлюється в якості основної групи"
         name_placeholder: "Group name, no spaces, same as username rule"
         primary: "Primary Group"
         no_primary: "(no primary group)"
@@ -1967,8 +3266,16 @@ uk:
         delete: "Видалити"
         delete_confirm: "Видалити цю групу?"
         delete_failed: "Не вдалося видалити групу. Якщо це - автоматична група, її неможливо знищити."
+        delete_owner_confirm: "Відкликати права власника у користувача '%{username}'?"
         add: "Додати"
+        custom: "Налаштовуються"
         automatic: "Автоматичні"
+        default_title: "Тема за замовчуванням"
+        default_title_description: "буде застосовуватися до всіх користувачів у групі"
+        group_owners: Власники
+        add_owners: Додати власників
+        none_selected: "Щоб почати, виберіть групу!"
+        no_custom_groups: "Створити нову кастомну групу"
       api:
         generate_master: "Згенерувати Головний ключ API"
         none: "Наразі немає жодного активного ключа API."
@@ -1976,6 +3283,8 @@ uk:
         title: "API"
         key: "Ключ API"
         created: Створено
+        last_used: Використано
+        never_used: (ніколи)
         generate: "Згенерувати"
         regenerate: "Перегенерувати"
         revoke: "Анулювати"
@@ -1983,52 +3292,118 @@ uk:
         confirm_revoke: "Are you sure you want to revoke that key?"
         info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "All Users"
+        note_html: "Нікому <strong>не повідомляйте</strong> цей ключ. Той, у кого він є, зможе створювати повідомлення, видаючи себе за будь-якого користувача форуму."
       web_hooks:
         title: "Вебгуки"
         none: "Зараз вебгуків немає."
         instruction: "Вебгуки дозволяють Discourse сповіщати зовнішні сервіси, коли на вашому сайті стаються певні події. Коли викликається вебгук, то на надані URL-посилання надсилається POST-запит."
+        detailed_instruction: "При настанні обраної події, на відповідний URL буде відправлений POST-запит."
         new: "Новий вебгук"
         create: "Створити"
         save: "Зберегти"
         destroy: "Видалити"
         description: "Опис"
+        controls: "Управління"
         go_back: "Повернутися до списку"
+        payload_url: "Посилання для відправки"
+        payload_url_placeholder: "https://example.com/postreceive"
         warn_local_payload_url: "Здається, ви намагаєтеся налаштувати вебгук на локальний URL. Подія, доставлена на локальну адресу, може дати побічний ефект або неочікувану поведінку. Продовжити?"
+        secret_invalid: "Ключ не повинен містити порожніх символів."
+        secret_too_short: "Ключ повинен бути не менше 12 символів."
+        secret_placeholder: "Додатковий рядок, використовується для створення підпису"
+        event_type_missing: "Вам необхідно налаштувати принаймні один тип подій."
+        content_type: "Тип вмісту"
         secret: "Секрет"
         event_chooser: "Які події мають викликати цей вебгук?"
+        wildcard_event: "Надсилати мені все."
+        individual_event: "Вибрати окремі події."
+        verify_certificate: "Перевіряти TLS сертифікат посилання для відправки даних"
         active: "Активний"
+        active_notice: "Ми будемо відправляти подробиці події, коли воно буде відбуватися."
         categories_filter_instructions: "Відповідні вебгуки викликатимуться, лише коли подія пов'язана з вказаними категоріями. Залишіть пустим, щоб викликати вебгуки для всіх категорій."
+        categories_filter: "Тільки для Цих Розділів"
         tags_filter_instructions: "Відповідні вебгуки викликатимуться, лише коли подія пов'язана з вказаними мітками. Залишіть пустим, щоб викликати вебгуки для всіх міток."
         tags_filter: "Викликані мітки"
         groups_filter_instructions: "Відповідні вебгуки викликатимуться, лише коли подія пов'язана з вказаними групами. Залишіть пустим, щоб викликати вебгуки для всіх груп."
+        groups_filter: "Тільки для Груп"
         delete_confirm: "Вилучити цей вебгук?"
+        topic_event:
+          name: "подія теми"
+          details: "Відбувається, коли тема створюється, переглядається, змінюється або видаляється."
+        post_event:
+          name: "подія повідомлення"
+          details: "Відбувається, коли повідомлення створюється, редагується, видаляється або відновлюється."
+        user_event:
+          name: "подія користувача"
+          details: "Коли користувач входить, виходить, створюється, підтверджується або змінюється."
+        group_event:
+          name: "групове Захід"
+          details: "При створенні, оновленні або видаленні групи."
+        category_event:
+          name: "Категорія Подій"
+          details: "Коли категорія створюється, оновлюється або видаляється."
         tag_event:
           name: "Подія мітки"
           details: "Коли мітка створюється, оновлюється або знищується"
+        flag_event:
+          name: "Відмітити подію"
+          details: "Коли прапор створений, узгоджений, не згоден або ігнорується."
+        queued_post_event:
+          name: "Пост після затвердження"
+          details: "Коли новий запис в черзі створюється, затверджується або відхиляється."
+        reviewable_event:
+          name: "переглянуті Події"
+          details: "Коли новий елемент готовий до розгляду та коли його статус оновлюється."
+        notification_event:
+          name: "подія Повідомлення"
+          details: "Коли користувач отримує повідомлення в своїй стрічці."
         delivery_status:
           title: "Стан доставки"
+          inactive: "Неактивно"
           failed: "Помилка"
           successful: "Успішно"
+          disabled: "Відключено"
         events:
+          none: "Немає пов’язаних подій."
+          redeliver: "Повернення"
+          incoming:
+            one: "Є нова подія."
+            few: "{{count}} нових події."
+            many: "{{count}} нових події."
+            other: "{{count}} нових події."
+          completed_in:
+            one: "Завершиться через %{count} секунду."
+            few: "Завершиться через {{count}} секунд."
+            many: "Завершиться через {{count}} секунд."
+            other: "Завершиться через {{count}} секунд."
           request: "Запит"
+          response: "відповідь"
+          redeliver_confirm: "Ви впевнені, що хочете повторно відправити ті ж самі дані?"
           headers: "Заголовки"
+          payload: "Дані для відправки"
           body: "Тіло"
           go_list: "Перейти до списку"
           go_details: " Редагувати вебгук"
           go_events: "Перейти до подій"
           ping: "Пінг"
+          status: "Код Стану"
           event_id: "ID"
           timestamp: "Створено"
+          completion: "Час Завершення"
           actions: "Дії"
       plugins:
         title: "Плагіни"
+        installed: "Встановлені плагіни"
         name: "Ім'я"
+        none_installed: "Немає жодного встановленого плагіна."
         version: "Версія"
         enabled: "Включено?"
         is_enabled: "Т"
         not_enabled: "Н"
         change_settings: "Зміна налаштувань"
         change_settings_short: "Налаштування"
+        howto: "Як встановити плагін?"
+        official: "Офіційний плагін"
       backups:
         title: "Backups"
         menu:
@@ -2050,7 +3425,10 @@ uk:
           size: "Size"
         upload:
           label: "Вивантажити"
+          title: "Завантажити копію на сервер"
           uploading: "Вивантаження..."
+          uploading_progress: "Завантаження... {{progress}}%"
+          success: "'{{filename}}' успішно завантажений. Файл тепер обробляється та займе хвилин, щоб його рядки відбилися в списку."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
@@ -2062,108 +3440,284 @@ uk:
           backup:
             label: "Backup"
             title: "Create a backup"
+            confirm: "Запустити резервне копіювання?"
+            without_uploads: "Так (не включати завантаження)"
           download:
             label: "Завантажити"
+            title: "Надіслати лист з посиланням для скачування"
+            alert: "Вам було відправлено посилання для скачування бекапа."
           destroy:
-            title: "Remove the backup"
-            confirm: "Are you sure you want to destroy this backup?"
+            title: "Видалити резервну копію"
+            confirm: "Ви переконані, що хочете видалити резервну копію?"
           restore:
-            is_disabled: "Restore is disabled in the site settings."
-            label: "Restore"
-            title: "Restore the backup"
+            is_disabled: "Відновлення вимкнено в налаштуваннях сайту."
+            label: "Відновити"
+            title: "Відновити резервну копію"
+            confirm: "Ви впевнені, що хочете відновити цей бекап?"
           rollback:
-            label: "Rollback"
-            title: "Rollback the database to previous working state"
+            label: "Відкотити"
+            title: "Відкотити базу даних до попереднього робочого стану"
+            confirm: "Ви впевнені, що хочете відкотити базу даних до попереднього робочого стану?"
+        location:
+          local: "Локальне сховище"
+          s3: "S3"
+        backup_storage_error: "Не вдалося отримати доступ до сховища резервних копій: %{error_message}"
       export_csv:
+        success: "Процедура експорту розпочато, ми відправимо вам повідомлення, коли процес буде завершений."
+        failed: "Експорт не вдався. Будь ласка, перевірте логи."
         button_text: "Експорт"
+        button_title:
+          user: "Експортувати список користувачів в CSV файл."
+          staff_action: "Експортувати повний журнал дій персоналу в CSV-файл."
+          screened_email: "Експортувати список email-адрес в CSV форматі."
+          screened_ip: "Експортувати список IP в CSV форматі."
+          screened_url: "Експортувати список URL-адрес в CSV форматі."
       export_json:
         button_text: "Експорт"
+      invite:
+        button_text: "Надіслати запрошення"
+        button_title: "Надіслати запрошення"
       customize:
         title: "Customize"
         long_title: "Site Customizations"
         preview: "preview"
-        save: "Save"
-        new: "New"
-        new_style: "New Style"
-        delete: "Delete"
+        explain_preview: "Попередній перегляд сайту з активованим стилем"
+        save: "Зберегти"
+        new: "Нове"
+        new_style: "Новий стиль"
+        install: "Install"
+        delete: "Видалити"
+        delete_confirm: 'Ви впевнені, що хочете видалити "%{theme_name}"?'
         color: "Колір"
         opacity: "Непрозорість"
         copy: "Копіювати"
+        copy_to_clipboard: "Скопіювати в буфер"
         copied_to_clipboard: "Скопійовано у буфер обміну"
         copy_to_clipboard_error: "Помилка під час копіювання даних у буфер обміну"
+        theme_owner: "Неможливо редагувати, власник: "
         email_templates:
           title: "Електронна пошта"
           subject: "Тема"
+          multiple_subjects: "Цей шаблон електронної пошти має безліч тем."
           body: "Тіло"
+          none_selected: "Виберіть шаблон листа, щоб почати редагування."
           revert: "Повернути зміни"
           revert_confirm: "Чи впевнені ви, що хочете повернути ваші зміни?"
         theme:
           theme: "Тема"
+          component: "Компонент"
+          components: "Компоненти"
+          theme_name: "Назва теми"
+          component_name: "Назва компонента"
+          themes_intro: "Виберіть існуючу тему, або встановіть нову, щоб почати роботу"
+          beginners_guide_title: "Керівництво для початківців по використанню Discourse Тем"
+          developers_guide_title: "Керівництво розробника по темам Discourse"
+          browse_themes: "Перегляд Тем спільноти "
+          customize_desc: "Налаштувати:"
+          title: "Стилі"
           create: "Створити"
           create_type: "Тип"
           create_name: "Ім'я"
+          long_title: "Стилізація сайту: кольори, CSS та HTML"
           edit: "Редагувати"
+          edit_confirm: "Це імпортований стиль. Зміни CSS/HTML загубляться після чергового оновлення стилю."
+          update_confirm: "Ці локальні зміни будуть видалені оновленням. Ви впевнені, що хочете продовжити?"
+          update_confirm_yes: "Так, продовжити оновлення"
+          common: "Загальна"
+          desktop: "Десктоп"
+          mobile: "Мобільний"
           settings: "Налаштування"
+          translations: "Переклади"
+          extra_scss: "Додаткові SCSS"
           preview: "Попередній перегляд"
+          show_advanced: "Показати додаткові поля"
+          hide_advanced: "Приховати додаткові поля"
+          hide_unused_fields: "Приховати невикористовувані поля"
+          is_default: "Активувати за замовчуванням"
+          user_selectable: "Користувачі можуть вибирати стиль"
+          color_scheme: "Колірна палітра"
+          color_scheme_select: "Виберіть кольори для стилю"
+          custom_sections: "Налаштування секцій:"
+          theme_components: "Компоненти стилю"
+          convert: "Конвертувати"
+          convert_component_alert: "Ви впевнені, що хочете перетворити цей компонент у тему? Він буде вилучений як компонент з%{relatives}."
+          convert_component_tooltip: "Перетворити цей компонент в тему"
+          convert_theme_alert: "Ви впевнені, що хочете перетворити цю тему в компонент? Він буде вилучений як батько з%{relatives}."
+          convert_theme_tooltip: "Перетворити цю тему в компонент"
+          inactive_themes: "Неактивні теми:"
+          inactive_components: "Невикористані компоненти:"
+          broken_theme_tooltip: "Ця тема має помилки в CSS, HTML або YAML"
+          disabled_component_tooltip: "Цей компонент відключений"
+          default_theme_tooltip: "Ця тема є темою за замовчуванням на сайті"
+          updates_available_tooltip: "Доступні оновлення для цієї теми"
+          and_x_more: "і більше {{count}}."
           collapse: Згорнути
+          uploads: "Завантаження"
+          no_uploads: "Ви можете завантажувати різні ресурси для вашого стилю, такі як шрифти та зображення"
+          add_upload: "Вкласти"
+          upload_file_tip: "Виберіть файл для завантаження (png, woff2 та т.д.)"
+          variable_name: "Ім’я змінної SCSS:"
+          variable_name_invalid: "Неправильне ім’я змінної. Допускається тільки буквено-цифрове значення. Повинен починатися з літери. Повинен бути унікальним."
+          variable_name_error:
+            invalid_syntax: "Неприпустиме ім’я змінної. Дозволені лише літери. Має починатися з літери."
+            no_overwrite: "Неприпустиме ім’я змінної. Не повинен перезаписувати існуючу змінну."
+            must_be_unique: "Неправильне ім’я змінної. Значення має бути унікальним."
           upload: "Завантажити"
+          select_component: "Виберіть компонент..."
+          unsaved_changes_alert: "Ви ще не зберегли свої зміни, хочете скасувати їх та рухатися далі?"
+          discard: "відмовити"
+          stay: "залишитися"
+          css_html: "Налаштування CSS/HTML"
+          edit_css_html: "Редагувати CSS/HTML"
+          edit_css_html_help: "Ви не внесли ніяких змін в CSS або HTML"
+          delete_upload_confirm: "Видалити цей файл? CSS стилю може перестати функціонувати!"
+          import_web_tip: "Репозиторій стилю"
+          import_web_advanced: "Додатково..."
+          import_file_tip: ".tar.gz, .zip, або .dcstyle .json файл, який містить тему"
+          is_private: "Тема знаходиться в приватному репозиторії git"
+          remote_branch: "Назва гілки (не обов’язково)"
+          public_key: "Надайте доступ до сховища з наступним відкритим ключем:"
+          install: "Install"
           installed: "Встановлена"
           install_popular: "Популярні"
+          install_upload: "З вашого пристрою"
+          install_git_repo: "Зі сховища git"
+          install_create: "Створити новий"
           about_theme: "Про"
           license: "Ліцензія"
+          version: "Версія:"
+          authors: "Автор:"
+          source_url: "Джерело"
           enable: "Включити"
           disable: "Відключити"
+          disabled: "Цей компонент відключений"
+          disabled_by: "Цей компонент був відключений"
+          required_version:
+            error: "Ця тема була автоматично відключена, тому що вона не сумісна з цією версією Discourse."
+            minimum: "Потрібна версія Discourse {{version}} або вище."
+            maximum: "Потрібна версія Discourse {{version}} або нижче."
+          component_of: "Компонент:"
           update_to_latest: "Оновити до останьої"
+          check_for_updates: "Перевірити оновлення"
+          updating: "Оновлюю..."
+          up_to_date: "Стиль поточної версії, остання перевірка:"
           add: "Додати"
+          theme_settings: "Налаштування теми"
+          no_settings: "Ця тема не має налаштувань."
+          theme_translations: "Переклад Теми"
+          empty: "Немає елементів"
+          commits_behind:
+            one: "Тема знаходиться на %{count} комміт позаду!"
+            few: "Тема знаходиться на {{count}} комітів позаду!"
+            many: "Тема знаходиться на {{count}} комітів позаду!"
+            other: "Тема знаходиться на {{count}} комітів позаду!"
+          compare_commits: "(Дивіться нові комміти)"
+          repo_unreachable: "Не вдалося зв’язатися з Git-репозиторієм цієї теми. Повідомлення про помилку:"
+          imported_from_archive: "Ця тема була імпортована з .zip файлу"
           scss:
             text: "CSS"
+            title: "Введіть CSS; допускаються всі стилі CSS і SCSS"
           header:
             text: "Header"
+            title: "Введіть HTML для розміщення над шапкою сайту"
+          after_header:
+            text: "Під шапкою"
+            title: "Введіть HTML для розміщення на всіх сторінках під шапкою"
+          footer:
+            text: "Підвал"
+            title: "Введіть HTML для відображення в підвалі сайту (внизу)"
+          embedded_scss:
+            text: "Вбудований CSS"
+            title: "Введіть CSS для вбудовування коментарів"
           head_tag:
             text: "</head>"
             title: "HTML-код, який буде вставлений перед міткою </head>"
           body_tag:
             text: "</body>"
             title: "HTML-код, який буде вставлений перед міткою </body>"
+          yaml:
+            text: "YAML"
+            title: "Визначити налаштування теми в форматі YAML"
         colors:
+          select_base:
+            title: "Виберіть базову колірну палітру"
+            description: "Базова палітра:"
           title: "Кольори"
+          edit: "Редагувати Кольорову Палітру"
+          long_title: "кольорові палітри"
+          about: "Змініть кольору, використовувані в темах. Створіть нову колірну палітру для початку."
+          new_name: "Нова Колірна Палітра"
           copy_name_prefix: "Копіювати з"
+          delete_confirm: "видалити цю колірну палітру?"
           undo: "скасувати"
           undo_title: "Скасувати ваші зміни цього кольору з часу останнього збереження."
           revert: "Повернути"
+          revert_title: "Скиньте цей колір на колірну палітру Discourse за замовчуванням."
           primary:
             name: "основний"
+            description: "Більшість текстів, іконок та кордонів."
           secondary:
             name: "вторинний"
+            description: "Основний колір фону та колір тексту для деяких кнопок."
           tertiary:
             name: "третинний"
+            description: "Посилання, деякі кнопки, повідомлення та акцентних колір."
           quaternary:
+            name: "четвертинний"
             description: "Навігаційні посилання."
           header_background:
             name: "фон заголовка"
+            description: "Фоновий колір заголовка сайту."
           header_primary:
+            name: "основний колір заголовка"
             description: "Текст та іконки в заголовку сайту."
           highlight:
             name: "висвітлення"
+            description: "Фоновий колір виділених елементів на сторінці, таких як повідомлення та теми."
+          danger:
+            name: "небезпека"
+            description: "Колір виділення для таких дій, як видалення повідомлень та тем."
           success:
             name: "успіх"
+            description: "Використовується, щоб показати, що дія виконана успішно."
           love:
             name: "любов"
             description: "Колір кнопки \"Подобається\"."
+        robots:
+          title: "Перевизначите файл robots.txt вашого сайту:"
+          warning: "Це назавжди перевизначити будь-які пов’язані налаштування сайту."
+          overridden: Файл robots.txt за замовчуванням вашого сайту перезаписан.
         email_style:
+          title: "E-mail Стиль"
+          heading: "Налаштувати стиль E-mail пошти"
+          html: "HTML Шаблон"
           css: "CSS"
+          reset: "Скинути за замовчуванням"
+          reset_confirm: "Ви впевнені, що хочете скинути налаштування за замовчуванням %{fieldName} та втратити всі свої зміни?"
+          save_error_with_reason: "Ваші зміни не були збережені. %{error}"
+          instructions: "Налаштування шаблону, в якому відображаються всі html-повідомлення e-mail пошти, та стиль за допомогою CSS."
       email:
         title: "Листів"
         settings: "Налаштування"
         templates: "Шаблони"
         preview_digest: "Стислий виклад новин"
+        advanced_test:
+          title: "Розширений Тест"
+          desc: "Подивіться, як Discourse обробляє отримані листи. Щоб правильно обробити лист, вставте нижче оригінальне повідомлення."
+          email: "Початкове повідомлення"
+          run: "Виконати Тест"
+          text: "Обраний Текст Тіла"
+          elided: "Виділений Текст"
         sending_test: "Надсилання тестового листа..."
-        sent: "Sent"
-        skipped: "Skipped"
+        error: "<b>ПОМИЛКА</b> -%{server_error}"
+        test_error: "При відправці тестового листа сталася помилка. Перевірте поштові налаштування, переконайтеся, що ваш поштовий провайдер не блокує поштові з’єднання, та спробуйте знову."
+        sent: "Надіслано"
+        skipped: "Пропущено"
+        bounced: "Повернено"
         received: "Отримано"
         rejected: "Відхилено"
         sent_at: "Надіслано"
-        time: "Time"
+        time: "Час"
         user: "Користувач"
         email_type: "Тип листа"
         to_address: "Скринька отримувача"
@@ -2171,25 +3725,32 @@ uk:
         send_test: "Надіслати Тестовий Email"
         sent_test: "надіслано!"
         delivery_method: "Спосіб доставки"
+        preview_digest_desc: "Попередні зведення новин на відправку неактивним користувач."
         refresh: "Оновити"
+        send_digest_label: "Відправити цей результат на:"
         send_digest: "Надіслати"
         sending_email: "Надсилання листа..."
         format: "Формат"
         html: "html"
         text: "текст"
         last_seen_user: "Востаннє помічено користувача:"
+        no_result: "Нічого не знайдено для зведення новин."
         reply_key: "Ключ відповіді"
-        skipped_reason: "Skip Reason"
+        skipped_reason: "Причина пропуску"
         incoming_emails:
           from_address: "Від"
           to_addresses: "До"
+          cc_addresses: "Кому копія (CC)"
           subject: "Тема"
           error: "Помилка"
+          none: "Листи не знайдені."
           modal:
+            title: "Подробиці вхідного листа"
             error: "Помилка"
             headers: "Заголовки"
             subject: "Тема"
             body: "Тіло"
+            rejection_message: "Лист відхилення"
           filters:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
@@ -2202,13 +3763,24 @@ uk:
             title: "Filter"
             user_placeholder: "username"
             address_placeholder: "name@example.com"
-            type_placeholder: "digest, signup..."
+            type_placeholder: "дайджест, підписка..."
+            reply_key_placeholder: "Ключ відповіді"
+      moderation_history:
+        performed_by: "Виконано користувачем "
+        no_results: "Історія модерації недоступна."
+        actions:
+          delete_user: "Видалити Користувача"
+          suspend_user: "Користувача призупинено"
+          silence_user: "Користувач відключений"
+          delete_post: "Коментар видалено"
+          delete_topic: "Тема видалена"
+          post_approved: "Повідомлення затверджено"
       logs:
         title: "Журнали"
         action: "Дія"
         created_at: "Створено"
-        last_match_at: "Остання відповідність"
-        match_count: "Відповідності"
+        last_match_at: "Останній збіг"
+        match_count: "Співпадіння"
         ip_address: "IP"
         topic_id: "ID теми"
         post_id: "ID допису"
@@ -2217,26 +3789,26 @@ uk:
         edit: "Редагувати"
         save: "Зберегти"
         screened_actions:
-          block: "block"
-          do_nothing: "do nothing"
+          block: "заблокувати"
+          do_nothing: "нічого не робити"
         staff_actions:
           all: "всі"
-          filter: "Filter:"
+          filter: "Фільтр:"
           title: "Дії персоналу"
           clear_filters: "Показати все"
           staff_user: "Користувач"
-          target_user: "Target User"
+          target_user: "Цільовий користувач"
           subject: "Тема"
           when: "Коли"
           context: "Контекст"
           details: "Деталі"
           previous_value: "Попереднє"
           new_value: "Нове"
-          diff: "Diff"
+          diff: "Різниця"
           show: "Показати"
           modal_title: "Деталі"
-          no_previous: "There is no previous value."
-          deleted: "No new value. The record was deleted."
+          no_previous: "Немає попереднього значення."
+          deleted: "Немає нового значення. Запис видалено."
           actions:
             delete_user: "видалення користувача"
             change_trust_level: "зміна рівня довіри"
@@ -2247,27 +3819,68 @@ uk:
             change_site_text: "змінити текст сайту"
             suspend_user: "призупинення користувача"
             unsuspend_user: "скасування призупинення"
+            removed_suspend_user: "призупинити користувача (видалено)"
+            removed_unsuspend_user: "призупинений користувач (вилучено)"
             grant_badge: "надати значок"
             revoke_badge: "скасувати значок"
             check_email: "Перевірити електронну пошту"
             delete_topic: "видалити тему"
+            recover_topic: "скасувати видалену тему"
             delete_post: "видалити допис"
+            impersonate: "вхід від імені користувача"
             anonymize_user: "анонімний користувач"
+            roll_up: "згруповані заблоковані IP адреси в підмережу"
             change_category_settings: "змінити налаштування категорії"
             delete_category: "видалити категорію"
             create_category: "створити категорію"
+            silence_user: "заблокувати користувача"
+            unsilence_user: "розблокувати користувача"
+            removed_silence_user: "мовчання користувача (видалено)"
+            removed_unsilence_user: "призупинений користувач (вилучено)"
             grant_admin: "зробити адміністратором"
             revoke_admin: "відкликати адміністраторство"
             grant_moderation: "зробити модератором"
             revoke_moderation: "відкликати модераторство"
+            backup_create: "створити резервну копію"
             deleted_tag: "вилучити мітку"
             deleted_unused_tags: "вилучити невикористовувані мітки"
             renamed_tag: "перейменована мітка"
+            revoke_email: "відкликати e-mail"
             lock_trust_level: "заблокувати рівень довіри"
+            unlock_trust_level: "розморожування рівня довіри"
+            activate_user: "активація користувача"
+            deactivate_user: "деактивация користувача"
+            change_readonly_mode: "зміна режиму \"тільки для читання\""
+            backup_download: "скачати резервну копію"
+            backup_destroy: "видалити резервну копію"
+            reviewed_post: "переглянуте повідомлення"
+            custom_staff: "дії в плагінах"
+            post_locked: "повідомлення заморожено"
+            post_edit: "редагувати повідомлення"
+            post_unlocked: "повідомлення розморожено"
+            check_personal_message: "перевірити приватне повідомлення"
+            disabled_second_factor: "відключити двохфакторну автентифікацію"
+            topic_published: "тема опублікована"
+            post_approved: "повідомлення затверджено"
+            post_rejected: "повідомлення відхилено"
+            create_badge: "створити нагороду"
+            change_badge: "змінити нагороду"
+            delete_badge: "видалити нагороду"
+            merge_user: "об’єднати користувача"
+            entity_export: "експортний об’єкт"
+            change_name: "змінити ім’я"
+            topic_timestamps_changed: "мітки часу теми змінені"
+            approve_user: "схвалений користувач"
             web_hook_create: "створити вебгук"
             web_hook_update: "оновити вебгук"
             web_hook_destroy: "знищити вебгук"
             web_hook_deactivate: "деактивувати вебгук"
+            embeddable_host_create: "створити вбудовується хост"
+            embeddable_host_update: "оновити вбудований хост"
+            embeddable_host_destroy: "видалити вбудований хост"
+            change_theme_setting: "змінити налаштування теми"
+            disable_theme_component: "відключити компонент теми"
+            enable_theme_component: "включити компонент теми"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
@@ -2275,37 +3888,87 @@ uk:
           actions:
             allow: "Дозволити"
         screened_urls:
-          title: "Screened URLs"
+          title: "Посилання"
           description: "Перелічені тут веб-адреси використовувалися в дописах користувачів, яких було ідентифіковано як спамерів."
           url: "Веб-адреса"
           domain: "Домен"
         screened_ips:
-          title: "Screened IPs"
+          title: "IP адреси"
           description: 'IP-адреси, що відслідковуються. Використовуйте "Дозволити", щоб включити IP-адресу до білого списку.'
           delete_confirm: "Ви впевнені, що хочете видалити правило для %{ip_address}?"
+          roll_up_confirm: "Згрупувати окремі екрановані IP адреси в підмережі?"
+          rolled_up_some_subnets: "Список заблокованих IP адреси згруповані в наступні підмережі: %{subnets}."
+          rolled_up_no_subnet: "Нічого не знайдено для групування"
           actions:
             block: "Заблокувати"
             do_nothing: "Дозволити"
+            allow_admin: "Дозволити адмінів"
           form:
-            label: "Нова:"
+            label: "Нове:"
             ip_address: "IP-адреса"
             add: "Додати"
             filter: "Пошук"
+          roll_up:
+            text: "Група"
+            title: "Створення нового запису бана цілої підмережі якщо вже є хоча б 'min_ban_entries_for_roll_up' записів окремих IP адрес."
         search_logs:
+          title: "Логи пошуку"
+          term: "Правило"
+          searches: "Пошуки"
+          click_through_rate: "CTR"
           types:
-            header: "Header"
+            all_search_types: "Всі типи пошуку"
+            header: "Шапка"
+            full_page: "Повна сторінка"
+            click_through_only: "Всі (тільки список)"
+          header_search_results: "Результати пошуку по заголовкам"
+        logster:
+          title: "Журнал помилок"
       watched_words:
+        title: "Відслідковувані слова"
         search: "Пошук"
         clear_filter: "Очистити"
+        show_words: "Показати слова"
+        one_word_per_line: "Одне слово в рядку"
         download: Завантажити
+        clear_all: Скинути все
+        clear_all_confirm_block: "Ви впевнені, що хочете видалити всі Популярні слова для дії Блокувати?"
+        clear_all_confirm_censor: "Ви впевнені, що хочете очистити всі Популярні слова для дії Цензора?"
+        clear_all_confirm_flag: "Ви впевнені, що хочете видалити всі Популярні слова для дії Прапор?"
+        clear_all_confirm_require_approval: "Ви впевнені, що хочете видалити всі Популярні слова для дії Вимагати затвердження?"
+        word_count:
+          one: "%{count} слово"
+          few: "%{count} слова"
+          many: "%{count} слів"
+          other: "%{count} слів"
         actions:
           block: "Заблокувати"
+          censor: "Цензура"
+          require_approval: "Що вимагають схвалення"
           flag: "Поскаржитися"
+        action_descriptions:
+          block: "Заборонити публікацію повідомлень, що містять ці слова. Користувач побачить повідомлення про помилку при спробі відправити своє повідомлення."
+          censor: "Дозволити повідомлення, що містять ці слова, але замінювати їх символами, які приховують цензурні вирази."
+          require_approval: "Коментарі, що містять ці слова, вимагатимуть схвалення персоналу, перш ніж їх можна буде побачити."
+          flag: "Дозволити повідомлення, що містять ці слова, але позначати їх як неприйнятні, щоб модератори могли їх оцінювати."
         form:
+          label: "Нове слово:"
+          placeholder: "слово цілком, зірочка (*) використовується як знак підстановки "
+          placeholder_regexp: "Регулярний вираз"
           add: "Додати"
           success: "Успіх"
+          exists: "Вже існує"
+          upload: "Додати з файлу"
+          upload_successful: "Завантаження пройшло успішно. Слова додані."
+        test:
+          button_label: "Тест"
+          modal_title: "Тест '%{action}' Відслідковувані Слова"
+          description: "Введіть текст нижче, щоб перевірити збіги зі стоп словами"
+          found_matches: "Знайдені збіги:"
+          no_matches: "Збігів, не знайдено"
       impersonate:
         title: "Втілитися"
+        help: "Використовуйте цей інструмент, щоб увійти від імені користувача. Може бути корисно для налагодження. Після цього необхідно вийти та зайти під своїм обліковим записом знову."
         not_found: "Цього користувача не вдалося знайти."
         invalid: "Даруйте, Ви не можете втілитися в цього користувача."
       users:
@@ -2314,12 +3977,16 @@ uk:
         last_emailed: "Останній ел. лист"
         not_found: "Даруйте, такого імені користувача немає в нашій системі."
         id_not_found: "Даруйте, користувача за таким номером немає в нашій системі."
+        active: "Активоване"
         show_emails: "Показати електронну пошту"
+        hide_emails: "приховати E-mails"
         nav:
           new: "Нові"
           active: "Активні"
           staff: "Персонал"
           suspended: "Призупинені"
+          silenced: "Відключений"
+          suspect: "Підозрілі"
           staged: "Недокористувач"
         approved: "Схвалено?"
         titles:
@@ -2328,23 +3995,57 @@ uk:
           pending: "Користувачі, що очікують на перевірку"
           newuser: "Користувачі з Рівнем довіри 0 (Новий користувач)"
           basic: "Користувачі з Рівнем довіри 1 (Базовий користувач)"
+          member: "Користувачі з рівнем довіри 2 (активні)"
+          regular: "Користувачі з рівнем довіри 3 (лідери спільноти)"
+          leader: "Користувачі з рівнем довіри 4 (старійшини)"
           staff: "Персонал"
           admins: "Адміністратори"
           moderators: "Модератори"
+          silenced: "Відключені користувачі"
           suspended: "Призупинені користувачі"
+          suspect: "Підозрілі користувачі"
           staged: "Недокористувачі"
         not_verified: "Не підтверджений"
         check_email:
+          title: "Відкрити e-mail цього користувача"
           text: "Показати"
       user:
         suspend_failed: "Щось трапилося під час призупинення цього користувача: {{error}}"
         unsuspend_failed: "Щось трапилося під час скасування призупинення цього користувача: {{error}}"
         suspend_duration: "На який термін призупинити діяльність цього користувача?"
         suspend_reason_label: "Чому Ви призупиняєте цього користувача? Цей текст <b>буде видимим для всіх</b> на сторінці профілю цього користувача, і його буде показано користувачу при спробі увійти в систему. Будьте лаконічні."
+        suspend_reason_hidden_label: "Чому ви призупиняєте користувача? Цей текст буде показаний користувачеві, коли він спробує увійти в систему. Будьте лаконічним."
         suspend_reason: "Причина"
+        suspend_reason_placeholder: "Причина призупинення"
+        suspend_message: "Повідомлення пошти"
+        suspend_message_placeholder: "При бажанні, надайте додаткову інформацію про припинення, та вона буде відправлена ​​користувачеві по електронній пошті."
         suspended_by: "Призупинено"
         silence_reason: "Причина"
+        silenced_by: "Відключено користувачем"
+        silence_modal_title: "Відключений користувач"
+        silence_duration: "Як довго користувач буде відключений?"
+        silence_reason_label: "Чому ви збираєтеся відключити користувача?"
+        silence_reason_placeholder: "Причина відключення"
+        silence_message: "Повідомлення пошти"
+        silence_message_placeholder: "(Залиште незаповненим, щоб відправити дефолтне повідомлення)"
+        suspended_until: "(Поки не буде %{until})"
+        cant_suspend: "Цього користувача не можна заморозити."
         delete_all_posts: "Видалити всі дописи"
+        delete_posts_progress: "Видалення постів..."
+        delete_posts_failed: "При видаленні постів виникла проблема."
+        penalty_post_actions: "Що потрібно зробити зі зв’язаним повідомленням?"
+        penalty_post_delete: "Видалити повідомлення"
+        penalty_post_delete_replies: "Видалити пост + будь-які відповіді"
+        penalty_post_edit: "Редагувати повідомлення"
+        penalty_post_none: "Нічого не робити"
+        penalty_count: "Кількість порушень"
+        clear_penalty_history:
+          title: "Очистити Історію Штрафів"
+          description: "користувачі зі штрафами не можуть досягти TL3"
+        delete_all_posts_confirm_MF: "Ви збираєтеся видалити {POSTS, plural, one {1 повідомлення} other {# повідомлень}} та {TOPICS, plural, one {1 тему} other {# тем}}. Ви впевнені?"
+        silence: "Відключити"
+        unsilence: "Підключити"
+        silenced: "Відключений?"
         moderator: "Модератор?"
         admin: "Адмін?"
         suspended: "Призупинено?"
@@ -2352,36 +4053,65 @@ uk:
         show_admin_profile: "Адмін"
         show_public_profile: "Показати публічний профіль"
         impersonate: "Втілитися"
+        action_logs: "Журнал дій"
         ip_lookup: "Пошук IP"
         log_out: "Вийти"
         logged_out: "Користувач вийшов зі системи на усіх пристроях"
         revoke_admin: "Відкликати адміністраторство"
         grant_admin: "Зробити адміністратором"
+        grant_admin_confirm: "Ми відправили вам лист з інструкціями для активації нового адміністратора."
         revoke_moderation: "Відкликати модераторство"
         grant_moderation: "Зробити модератором"
         unsuspend: "Скасувати призупинення"
         suspend: "Призупинити"
+        show_flags_received: "Показати отримані прапори"
+        flags_received_by: "Прапори, отримані%{username}"
+        flags_received_none: "Цей користувач не отримав ніяких прапорів."
         reputation: Репутація
         permissions: Дозволи
         activity: Активність
+        like_count: Симпатій висловив / отримав
         last_100_days: "протягом останніх 100 днів"
         private_topics_count: Приватних тем
         posts_read_count: Дописів прочитано
         post_count: Дописів створено
+        second_factor_enabled: Двухфакторная аутентифікація включена
         topics_entered: Тем переглянуто
         flags_given_count: Скарг подано
         flags_received_count: Скарг отримано
         warnings_received_count: Отримано попереджень
+        flags_given_received_count: "Скарг відправив / отримав"
         approve: "Схвалити"
         approved_by: "схвалено"
         approve_success: "Користувача схвалено і йому надіслано лист з інструкціями для активації."
         approve_bulk_success: "Успіх! Всіх обраних користувачів було схвалено та сповіщено про це."
         time_read: "Час читання"
         anonymize: "Анонімний користувач"
+        anonymize_confirm: "Ви точно ВПЕВНЕНІ, що хочете анонімізувати цей обліковий запис? Це призведе до зміни псевдоніма та адреси електронної пошти та очистить всю інформацію профілю."
         anonymize_yes: "Так, приховати цей обліковий запис"
+        anonymize_failed: "Не вдалося анонімізувати обліковий запис."
         delete: "Видалити користувача"
         delete_forbidden_because_staff: "Адмінів та модераторів видаляти не можна."
+        delete_posts_forbidden_because_staff: "Не можна видалити всі повідомлення адміністраторів та модераторів."
+        delete_forbidden:
+          one: "Його користувачі не можуть бути видалені, якщо у них є повідомлення. Перед видаленням користувача видаліть всі його повідомлення. (Повідомлення старше%{count} дня не можуть бути видалені.)"
+          few: "Його користувачі НЕ можуть бути видалені, якщо у них є повідомлення. Перед видаленням користувача видаліть всі його повідомлення. (повідомлення старше %{count} днів НЕ можуть бути видалені.)"
+          many: "Його користувачі НЕ можуть бути видалені, якщо у них є повідомлення. Перед видаленням користувача видаліть всі його повідомлення. (повідомлення старше %{count} днів НЕ можуть бути видалені.)"
+          other: "Його користувачі НЕ можуть бути видалені, якщо у них є повідомлення. Перед видаленням користувача видаліть всі його повідомлення. (повідомлення старше %{count} днів НЕ можуть бути видалені.)"
+        cant_delete_all_posts:
+          one: "Не вдалося видалити всі повідомлення. Деякі повідомлення старше %{count} дня. (Налаштування delete_user_max_post_age.)"
+          few: "Не вдалось визначити видалити всі повідомлення. Деякі повідомлення старше %{count} днів. (Налаштування delete_user_max_post_age.)"
+          many: "Не вдалось визначити видалити всі повідомлення. Деякі повідомлення старше %{count} днів. (Налаштування delete_user_max_post_age.)"
+          other: "Не вдалось визначити видалити всі повідомлення. Деякі повідомлення старше %{count} днів. (Налаштування delete_user_max_post_age.)"
+        cant_delete_all_too_many_posts:
+          one: "Не вдалося видалити всі повідомлення, тому що у користувача більш %{count} повідомлення. (Налаштування delete_all_posts_max.)"
+          few: "Не вдалось визначити видалити всі повідомлення, тому що у користувача більш %{count} повідомлень. (Налаштування delete_all_posts_max.)"
+          many: "Не вдалось визначити видалити всі повідомлення, тому що у користувача більш %{count} повідомлень. (Налаштування delete_all_posts_max.)"
+          other: "Не вдалось визначити видалити всі повідомлення, тому що у користувача більш %{count} повідомлень. (Налаштування delete_all_posts_max.)"
+        delete_confirm: "Зазвичай краще анонімізувати користувачів, ніж видаляти їх, щоб уникнути видалення контенту з існуючих обговорень. <br><br>Ви впевнені, що хочете видалити цього користувача? Це назавжди!"
+        delete_and_block: "Видалити та <b>заблокувати</b> цей e-mail та IP адресу"
         delete_dont_block: "Лише видалення"
+        deleting_user: "Видалити користувача..."
         deleted: "Користувача було видалено."
         delete_failed: "Під час видалення цього користувача трапилася помилка. Переконайтеся, що всі дописи користувача видалено перед тим, як видаляти самого користувача."
         send_activation_email: "Надіслати листа для активації"
@@ -2391,17 +4121,38 @@ uk:
         activate_failed: "Під час активації користувача сталася помилка."
         deactivate_account: "Деактивувати обліковий запис"
         deactivate_failed: "Під час деактивації користувача сталася помилка."
+        unsilence_failed: "При підключенні цього користувача сталася помилка."
+        silence_failed: "При відключенні цього користувача сталася помилка."
+        silence_confirm: "Ви впевнені, що хочете відключити цього користувача? Він не зможе створювати нові теми або повідомлення."
+        silence_accept: "Так, відключити цього користувача"
+        bounce_score: "Повернень Листів"
         reset_bounce_score:
           label: "Скинути"
+          title: "Скинути карму до 0"
+        visit_profile: "Відвідайте <a href='%{url}'>сторінку налаштувань цього користувача</a>, щоб відредагувати його профіль"
         deactivate_explanation: "Деактивований користувач має повторно підтвердити свою електронну скриньку."
         suspended_explanation: "Призупинений користувач не може увійти."
+        silence_explanation: "Відключений користувач не може публікувати, або відповідати на теми."
         staged_explanation: "Недокористувач може публікувати дописи лише через електронну пошту у деяких темах."
+        bounce_score_explanation:
+          none: "Немає повернень отриманих недавно від цієї пошту."
+          some: "Кілька повернень отримано недавно від цієї пошту."
+          threshold_reached: "Отримано занадто багато повернень від цієї пошту."
         trust_level_change_failed: "Під час зміни Рівня довіри користувача трапилася помилка."
         suspend_modal_title: "Призупинити користувача"
         trust_level_2_users: "Користувачі з Рівнем довіри 2"
         trust_level_3_requirements: "Вимоги для Рівня довіри 3"
+        trust_level_locked_tip: "рівень довіри заморожений, система не зможе за потреби розжалувати або просунути користувача"
+        trust_level_unlocked_tip: "рівень довіри розморожений, система зможе за потреби розжалувати або просунути користувача"
+        lock_trust_level: "Заморозити рівень довіри"
+        unlock_trust_level: "Розморозити рівень довіри"
         tl3_requirements:
           title: "Вимоги для Рівня довіри 3"
+          table_title:
+            one: "За останній день:"
+            few: "За останні %{count} днів:"
+            many: "За останні %{count} днів:"
+            other: "За останні %{count} днів:"
           value_heading: "Значення"
           requirement_heading: "Вимога"
           visits: "Відвідини"
@@ -2412,31 +4163,72 @@ uk:
           posts_read: "Прочитано Дописів"
           posts_read_all_time: "Прочитано дописів (весь час)"
           flagged_posts: "Оскаржені дописи"
+          flagged_by_users: "Користувачі, які подавали скарги"
           likes_given: "Вподобані"
           likes_received: "Отримані вподобання"
+          likes_received_days: "Отримано симпатій: окремі дні"
+          likes_received_users: "Отримано симпатій: унікальні користувачі"
+          suspended: "Призупинено (за останні 6 місяців)"
+          silenced: "Заморожене (останні 6 місяців)"
+          qualifies: "Заслуговує рівень довіри 3."
+          does_not_qualify: "Не заслуговує рівень довіри 3."
+          will_be_promoted: "Користувач буде скоро просунутий до цього рівня."
+          will_be_demoted: "Користувач скоро буде розжалуваний."
+          on_grace_period: "В даний момент в періоді довіри та не може бути розжалуваний."
+          locked_will_not_be_promoted: "Рівень довіри заморожений, тому користувач ніколи не буде просунутий до цього рівня."
+          locked_will_not_be_demoted: "Рівень довіри заморожений, тому користувач ніколи не буде розжалуваний."
         sso:
+          title: "Технологія єдиного входу SSO"
           external_id: "Зовнішній ID"
           external_username: "Ім'я користувача"
           external_name: "Ім'я"
           external_email: "Електронна пошта"
+          external_avatar_url: "URL фону профілю"
       user_fields:
+        title: "Поля користувача"
+        help: "Додати поля, які користувачі зможуть заповнювати."
+        create: "Створити поле користувача"
         untitled: "Без заголовку"
+        name: "Назва поля"
         type: "Тип поля"
         description: "Поле опису"
         save: "Зберегти"
         edit: "Редагувати"
         delete: "Видалити"
         cancel: "Скасувати"
+        delete_confirm: "Ви впевнені, що хочете видалити це поле?"
         options: "Налаштування"
+        required:
+          title: "Обов’язкове під час реєстрації?"
+          enabled: "Обов’язкове"
+          disabled: "Необов’язкове"
+        editable:
+          title: "Редаговане після реєстрації?"
+          enabled: "Редаговане"
+          disabled: "Нередаговане"
+        show_on_profile:
+          title: "Показувати в публічному профілі?"
+          enabled: "Показувати в профілі"
+          disabled: "Не показувати в профілі"
+        show_on_user_card:
+          title: "Показувати в картці користувача?"
+          enabled: "показується в картці користувача"
+          disabled: "Не показувати в картці користувача"
         field_types:
           text: "Текстове поле"
           confirm: "Підтвердження"
+          dropdown: "Випадаючий список"
       site_text:
+        description: "Ви можете відредагувати будь-який текст на вашому форумі. Почніть з пошуку нижче:"
+        search: "Знайти текст, котрий ви хочете відредагувати"
+        title: "Текст"
         edit: "редагувати"
         revert: "Повернути зміни"
         revert_confirm: "Чи впевнені ви, що хочете повернути ваші зміни?"
         go_back: "Повернутись до пошуку"
+        recommended: "Ми рекомендуємо змінити наступний текст під ваші потреби:"
         show_overriden: "Показувати тільки перевизначені"
+        more_than_50_results: "Знайдено понад 50 результатів. Будь ласка виправте параметри пошуку."
       settings:
         show_overriden: "Показувати тільки перевизначені"
         reset: "скинути"
@@ -2444,15 +4236,23 @@ uk:
       site_settings:
         title: "Налаштування"
         no_results: "Не знайдено результатів."
+        more_than_30_results: "Знайдено понад 30 результатів. Будь ласка виправте параметри пошуку або виберіть розділ."
         clear_filter: "Очистити"
         add_url: "додати URL"
         add_host: "додати хост"
+        add_group: "додати групу"
         uploaded_image_list:
+          label: "Змінити список"
+          empty: "Фотографій поки немає. Будь ласка, завантажте одне."
           upload:
             label: "Завантажити"
+            title: "Завантажити зображення"
+        selectable_avatars:
+          title: "Список аватарів, які користувачі можуть вибрати"
         categories:
           all_results: "Всі"
           required: "Обов'язкові"
+          branding: "Брендинг"
           basic: "Основні установки"
           users: "Користувачі"
           posting: "Опублікування"
@@ -2460,6 +4260,7 @@ uk:
           files: "Файли"
           trust: "Рівні довіри"
           security: "Безпека"
+          onebox: "Розумна вставка"
           seo: "SEO"
           spam: "Спам"
           rate_limits: "Обмеження швидкості"
@@ -2467,8 +4268,9 @@ uk:
           embedding: "Взаємодія"
           legal: "Legal"
           api: "API"
+          user_api: "API користувача"
           uncategorized: "Інше"
-          backups: "Backups"
+          backups: "Резервні копії"
           login: "Вхід"
           plugins: "Плагіни"
           user_preferences: "Налаштування"
@@ -2476,58 +4278,125 @@ uk:
           search: "Пошук"
           groups: "Групи"
           dashboard: "Майстерня"
+        secret_list:
+          invalid_input: "поля введення не можуть бути порожніми, або містити символ вертикальної риски."
+        default_categories:
+          modal_description: "Хотіли б ви застосувати цю зміну історично? Це змінить налаштування для %{count} існуючих користувачів."
+          modal_yes: "Так"
+          modal_no: "Ні, тільки застосувати зміни в майбутньому"
       badges:
-        title: Значки
-        new_badge: Новий значок
-        new: Новий
+        title: Нагороди
+        new_badge: Нова нагорода
+        new: Нове
         name: Ім'я
-        badge: Значок
+        badge: Нагорода
         display_name: "Ім'я, що відображається"
         description: Опис
         long_description: Розширений опис
+        badge_type: Тип нагороди
         badge_grouping: Група
+        badge_groupings:
+          modal_title: Типи Нагороди
+        granted_by: Ким видана
+        granted_at: Коли видана
+        reason_help: "(Посилання на повідомлення, або тему)"
         save: Зберегти
         delete: Видалити
         delete_confirm: "Ви впевнені, що хочете видалити цю відзнаку?"
         revoke: Відкликати
         reason: Причина
-        edit_badges: Редагувати Значки
-        grant_badge: Надати Значок
-        granted_badges: Надані Значки
+        expand: Розгорнути &hellip;
+        revoke_confirm: "Ви впевнені, що хочете відкликати цю нагороду?"
+        edit_badges: Редагувати нагороди
+        grant_badge: Надати нагороду
+        granted_badges: Надані нагороди
         grant: Надати
         no_user_badges: "%{name} не отримував жодного ."
         no_badges: "Тут немає значків, які можуть бути надані."
+        none_selected: "Виберіть нагороди в списку ліворуч"
         allow_title: Дозволити використання значків як звань
         multiple_grant: Можуть бути надані декілька разів
+        listable: Відображати нагороди на публічній сторінці Нагороди
         enabled: Включити відзнаки
         icon: Іконка
         image: Зображення
+        icon_help: "Введіть назву значка Font Awesome (використовуйте префікс 'far-' для звичайних значків та 'fab-' для значків брендів)"
+        image_help: "Введіть URL-адресу зображення (переопределяет поле Нагороди, якщо встановлені обидва)"
+        query: Вибірка нагороди (SQL)
+        target_posts: Вибірка цільових повідомлень
+        auto_revoke: Запускати запит на відкликання щодня
+        show_posts: "Показувати повідомлення, на основі якого була видана нагорода, на сторінці Нагороди"
+        trigger: Запуск
         trigger_type:
           none: "Щоденні оновлення"
           post_action: "Коли користувач щось робить у допису"
           post_revision: "Коли користувач редагує або створює допис"
           trust_level_change: "Коли користувач змінює рівень довіри"
           user_change: "Коли користувач змінений або створений"
+          post_processed: "Після обробки повідомлення"
         preview:
+          link_text: "Попередній перегляд виданих Нагород"
+          plan_text: "Попередній перегляд з аналізом швидкодії"
+          modal_title: "Попередній перегляд запиту нагороди"
+          sql_error_header: "У запиті сталася помилка."
+          error_help: "Див. наступне посилання з інформацією за запитами для нагороди."
           bad_count_warning:
             header: "УВАГА!"
+            text: "Виявлено неіснуючі приклади видачі нагороди. Це може статися, коли запит повертає неіснуючі ідентифікатори ID користувачів або Повідомлень. Це може привести до несподіваних проблем з часом, тому уважно перевірте ваш запит."
+          no_grant_count: "Немає нагород для видачі."
+          grant_count:
+            one: "Буде видано <b>%{count}</b> нагорода."
+            few: "<b>%{count}</b> нагороди будуть видані."
+            many: "<b>%{count}</b> нагороди будуть видані."
+            other: "<b>%{count}</b> нагороди будуть видані."
           sample: "Зразок:"
+          grant:
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span> за повідомлення в %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> за повідомлення в %{link} в <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> в <span class=\"time\">%{time}</span>"
+        badge_intro:
+          title: "Виберіть існуючу нагороду або створіть нову, щоб почати роботу"
+          what_are_badges_title: "Що таке нагороди?"
+          badge_query_examples_title: "Приклади запиту нагород"
       emoji:
+        title: "Іконки"
+        help: "Додати нові смайли-emoji, які будуть доступні всім. (Підказка: можна перетягувати кілька файлів за раз)"
+        add: "Додати нову іконку"
         name: "Ім'я"
         image: "Зображення"
+        delete_confirm: "Ви впевнені, що хочете видалити іконку :%{name}:?"
       embedding:
+        get_started: "Для вбудовування на Інший сайт необхідно додати відповідний хост."
         confirm_delete: "Ви впевнені, що хочете видалити цей хост?"
+        sample: "Використовуйте наступний HTML-код на своєму сайті, для можливості створення пов’язаних тем. Замініть <b>REPLACE_ME</b> канонічної посиланням сторінки, куди проводиться вбудовування."
         title: "Взаємодія"
         host: "Дозволені Хости"
+        class_name: "Назва класу"
+        path_whitelist: "Дозволений Шлях"
         edit: "редагувати"
         category: "Допис у Категорію"
         add_host: "Додати Хост"
+        settings: "Налаштування вбудовування"
+        feed_settings: "Налаштування Фіда"
+        feed_description: "Підтримка RSS/ATOM вашим сайтом може поліпшити можливості імпорту даних."
+        crawling_settings: "налаштування визначення"
+        crawling_description: "Якщо RSS/ATOM не підтримується, то при створенні тем Discourse спробує розібрати вміст з HTML. У деяких випадках вилучення вмісту виявляється складним, тому ми надаємо можливість задавати правила CSS, щоб зробити витяг простіше."
         embed_by_username: "Ім'я користувача для створення теми"
         embed_post_limit: "Максимальна кількість дописів для вставки"
+        embed_username_key_from_feed: "Ключ для вилучення користувача з стрічки"
+        embed_title_scrubber: "Регулярний вираз, що використовується для очищення заголовка повідомлень"
+        embed_truncate: "Обрізати вбудовані повідомлення."
+        embed_whitelist_selector: "Селектори CSS які дозволені для використання."
+        embed_blacklist_selector: "Селектори CSS які заборонені для використання."
         embed_classname_whitelist: "Дозволені імена класів CSS"
         feed_polling_enabled: "Імпортувати дописи через RSS/ATOM"
+        feed_polling_url: "Посилання на RSS/ATOM"
+        feed_polling_frequency_mins: "Частота опитування стрічки (в хвилинах)"
+        save: "Зберегти налаштування вбудовування"
       permalink:
         title: "Постійні посилання"
+        description: "Зверніть увагу, що це стосується лише зовнішніх джерел, посилання, розміщені на вашому форумі, не будуть перенаправлені."
         url: "Посилання"
         topic_id: "ID теми"
         topic_title: "Тема"
@@ -2542,12 +4411,19 @@ uk:
           add: "Додати"
           filter: "Пошук (URL або зовнішній URL)"
       reseed:
+        action:
+          label: "Замінити Текст..."
+          title: "Замінити текст категорій та тем з перекладами"
         modal:
+          title: "замінити Текст"
+          subtitle: "Замінити текст системних категорій та тем останніми перекладами"
           categories: "Categories"
           topics: "Теми"
+          replace: "Замінити"
   wizard_js:
     wizard:
       done: "Виконано"
+      finish: "Закінчено"
       back: "Назад"
       next: "Далі"
       step: "%{current} з %{total}"
@@ -2555,12 +4431,19 @@ uk:
       uploading: "Вивантаження..."
       upload_error: "Даруйте, під час завантаження цього файлу трапилася помилка. Будь ласка, спробуйте ще раз."
       quit: "Можливо пізніше"
+      staff_count:
+        one: "У вашій спільноті %{count} співробітник (це ви)."
+        few: "У вашій спільноті %{count} співробітника, включаючи вас."
+        many: "У вашій спільноті %{count} співробітників, включаючи вас."
+        other: "У вашій спільноті %{count} співробітників, включаючи вас."
       invites:
         add_user: "додати"
+        none_added: "Ви ще не запросили співробітників. Ви впевнені, що хочете продовжити?"
         roles:
           admin: "Адмін"
           moderator: "Модератор"
           regular: "Звичайний користувач"
       previews:
+        topic_title: "Тема обговорення"
         share_button: "Поширити"
         reply_button: "Відповісти"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index d09edc0e4c..db26618b01 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -913,7 +913,7 @@ ur:
           default_name: "میرا تصديق کنندہ"
         security_key:
           register: "رجسٹر"
-          delete: 'حذف کریں'
+          delete: "حذف کریں"
       change_about:
         title: "\"میرے بارے میں\" تبدیل کریں"
         error: "اِس چیز کو تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
@@ -939,9 +939,6 @@ ur:
         uploaded_avatar_empty: "اپنی مرضی کی تصویر شامل کریں"
         upload_title: "آپنی تصویر اَپ لوڈ کریں"
         image_is_not_a_square: "انتباہ: ہم نے آپ کی تصویر کو کراپ کیا ہے؛ چوڑائی اور اونچائی برابر نہیں تھے۔"
-      change_profile_background:
-        title: "پروفائل کا پسِ منظر"
-        instructions: "پروفائل کا پسِ منظر مرکوز ہو گا اور اُس کی 850 پِکسل کی پہلے سے طے شدہ چوڑائی ہو گی۔"
       change_card_background:
         title: "صارف کارڈ کا پسِ منظر"
         instructions: "پسِ منظر کی تصاویر مرکوز ہوں گی اور اُن کی 590 پِکسل کی پہلے سے طے شدہ چوڑائی ہو گی۔"
@@ -1183,6 +1180,9 @@ ur:
       title:
         title: "عنوان"
         none: "(کوئی نہیں)"
+      primary_group:
+        title: "پرائمری گروپ"
+        none: "(کوئی نہیں)"
       filters:
         all: "تمام"
       stream:
@@ -1515,7 +1515,6 @@ ur:
       link_description: "یہاں لِنک کی تفصیل درج کریں"
       link_dialog_title: "ہائپرلِنک ڈالیں"
       link_optional_text: "اختیاری عنوان"
-      link_url_placeholder: "https://example.com"
       quote_title: "بلاک کوٹ"
       quote_text: "بلاک کوٹ"
       code_title: "پہلے سے فارمیٹ کیا گیا ٹَیکسٹ"
@@ -2206,6 +2205,9 @@ ur:
         image_upload_not_allowed_for_new_user: "معذرت، نئے صارفین تصاویر اَپ لوڈ نہیں کر سکتے۔"
         attachment_upload_not_allowed_for_new_user: "معذرت، نئے صارفین اٹیچمنٹس اَپ لوڈ نہیں کر سکتے۔"
         attachment_download_requires_login: "معذرت، اٹیچمنٹس ڈائونلوڈ کرنے کیلیے آپ کا لاگ اِن ہونا ضروری ہے۔"
+      abandon_edit:
+        no_value: "نہیں، رکھیں"
+        no_save_draft: "نہیں، ڈرافٹ محفوظ کریں"
       abandon:
         confirm: "کیا آپ واقعی اپنی پوسٹ کو تَرک کرنا چاہتے ہیں؟"
         no_value: "نہیں، رکھیں"
@@ -2348,7 +2350,6 @@ ur:
       tags_allowed_tags: "اس زُمرہ میں اِن ٹیگز کو محدود کریں:"
       tags_allowed_tag_groups: "اس زُمرہ میں اِن ٹیگ گروپس کو محدود کریں:"
       tags_placeholder: "(اختیاری) اجازت والے ٹیگز کی فہرست"
-      tags_tab_description: "یہاں بیان کردہ ٹیگز اور ٹیگ گروپس صرف اِس زُمرہ اور دیگر زُمرہ جات بھی جو انہیں مخصوص کرتے ہیں، کیلئے دستیاب ہوں گے۔ یہ دیگر زُمرہ جات میں استعمال کیلئے دستیاب نہیں ہوں گے۔"
       tag_groups_placeholder: "(اختیاری) اجازت والے ٹیگ گروپس کی فہرست"
       manage_tag_groups_link: "ٹیگ گروپس کا انتظام یہاں کریں"
       allow_global_tags_label: "دوسرے ٹیگز کی بھی اجازت دیں"
@@ -2641,8 +2642,8 @@ ur:
       readonly: "ملاحظہ کریں"
     lightbox:
       download: "ڈاؤن لوڈ"
-      previous: "پچھلا (بائیں تیر کِی)"
-      next: "اگلا (بائیں تیر کِی)"
+      previous: "پچھلا (بائیں تیر کلید)"
+      next: "اگلا (بائیں تیر کلید)"
       counter: "%curr% of %total%"
       close: "بند (Esc)"
       content_load_error: '<a href="%url%">مواد</a> لوڈ نہیں کیا جا سکا۔'
@@ -2985,7 +2986,6 @@ ur:
             publish_read_state: "گروپ پیغامات پر گروپ رِیڈ اسٹیٹ شائع کریں۔"
           membership:
             automatic: خود کار طریقے سے
-            trust_level: ٹرسٹ لَیول
             trust_levels_title: "ممبران کو شامل کرتے وقت خود کار طریقے سے دیا جانے والا ٹرسٹ لَیول:"
             trust_levels_none: "کوئی نہیں"
             automatic_membership_email_domains: "جو صارفین ایک ایسے اِیمیل ڈومین کے ساتھ رجسٹر کرتے ہیں جو اِس فہرست میں سے کسی ایک سے پورا ملتا ہے، تو اُن کو خود کار طریقے سے اِس گروپ میں شامل کر دیا جائے گا:"
@@ -3997,6 +3997,8 @@ ur:
           dashboard: "ڈَیش بورڈ"
         secret_list:
           invalid_input: "اِن پُٹ فیلڈز خالی یا عمودی بار کے حرف پر مشتمل نہیں ہو سکتیں۔"
+        default_categories:
+          modal_yes: "جی ہاں"
       badges:
         title: بَیج
         new_badge: نیا بَیج
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 8daaec0f8d..485576cfc5 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -78,6 +78,10 @@ vi:
           other: "%{count} giờ trước"
         x_days:
           other: "%{count} ngày trước"
+        x_months:
+          other: "%{count}tháng trước"
+        x_years:
+          other: "%{count}năm trước"
       later:
         x_days:
           other: "còn %{count} ngày"
@@ -215,6 +219,8 @@ vi:
       moderators: "Điều hành viên"
       stat:
         all_time: "Từ trước tới nay"
+        last_7_days: "7 ngày gần nhất"
+        last_30_days: "30 ngày gần nhất"
       like_count: "Lượt thích"
       topic_count: "Các chủ đề"
       post_count: "Các bài viết"
@@ -778,7 +784,7 @@ vi:
         show_key_description: "Nhập thủ công"
         edit: "Sửa"
         security_key:
-          delete: 'Xóa'
+          delete: "Xóa"
       change_about:
         title: "Thay đổi thông tin về tôi"
         error: "Có lỗi xảy ra khi thay đổi giá trị này."
@@ -801,9 +807,6 @@ vi:
         uploaded_avatar_empty: "Thêm một ảnh chỉnh sửa"
         upload_title: "Upload hình ảnh của bạn"
         image_is_not_a_square: "Cảnh báo: chúng tôi đã cắt hình ảnh của bạn; chiều rộng và chiều cao không bằng nhau."
-      change_profile_background:
-        title: "Hình nền trang hồ sơ"
-        instructions: "Hình nền trang hồ sơ sẽ ở giữa và có chiều rộng mặc định là 850px."
       change_card_background:
         title: "Hình nền Card"
         instructions: "Hình nền sẽ ở giữa và có chiều rộng mặc định là 590px."
@@ -1014,6 +1017,9 @@ vi:
       title:
         title: "Tiêu đề"
         none: "(không có gì)"
+      primary_group:
+        title: "Nhóm Chính"
+        none: "(không có gì)"
       filters:
         all: "All"
       stream:
@@ -1345,6 +1351,7 @@ vi:
         with_badge:
           label: Với huy hiệu
         filters:
+          title: Chỉ khớp với tiêu đề
           likes: Tôi đã thích
           posted: Tôi đã gửi trong
           pinned: được gim
@@ -1695,6 +1702,8 @@ vi:
         image_upload_not_allowed_for_new_user: "Xin lỗi, tài khoản mới không thể tải lên ảnh."
         attachment_upload_not_allowed_for_new_user: "Xin lỗi, tài khoản mới không thể tải lên đính kèm."
         attachment_download_requires_login: "Xin lỗi, bạn cần đăng nhập để tải về đính kèm."
+      abandon_edit:
+        no_value: "Không, giữ lại"
       abandon:
         confirm: "Bạn có chắc muốn bỏ bài viết của bạn?"
         no_value: "Không, giữ lại"
@@ -2201,6 +2210,8 @@ vi:
         reports:
           today: "Hôm nay"
           yesterday: "Hôm qua"
+          last_7_days: "7 ngày gần nhất"
+          last_30_days: "30 ngày gần nhất"
           all_time: "Từ trước tới nay"
           7_days_ago: "7 Ngày trước"
           30_days_ago: "30 Ngày trước"
@@ -2232,7 +2243,6 @@ vi:
               public: "Mọi người"
           membership:
             automatic: Tự động
-            trust_level: Bậc tin tưởng
             trust_levels_title: "Cấp độ tin tưởng tự động tăng cho thành viên khi họ thêm:"
             trust_levels_none: "Không có gì"
             automatic_membership_email_domains: "Các thành viên đã đăng ký với đuôi email khớp với một trong danh sách này sẽ được tự động thêm vào nhóm:"
@@ -2835,6 +2845,8 @@ vi:
           search: "Tìm kiếm"
           groups: "Nhóm"
           dashboard: "Bảng điều khiển"
+        default_categories:
+          modal_yes: "Đồng ý"
       badges:
         title: Huy hiệu
         new_badge: Thêm huy hiệu
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 40b630f763..6dff96bc0f 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -294,15 +294,24 @@ zh_CN:
       order_by: "排序依据"
       in_reply_to: "回复给"
       explain:
+        why: "解释为什么该项目最终进入队列"
         title: "需审核评分"
         formula: "公式"
         subtotal: "小计"
         total: "总请求数"
         min_score_visibility: "可见时的最低分数"
         score_to_hide: "隐藏帖子的分数"
+        take_action_bonus:
+          name: "立即执行"
+          title: "当工作人员选择采取行动时，会给标记加分。"
+        user_accuracy_bonus:
+          name: "用户准确性"
+          title: "历史上已同意其标记的用户将获得奖励。"
         trust_level_bonus:
           name: "信任等级"
           title: "待审阅项目由较高信任级别且具有较高分数的用户创建的。"
+        type_bonus:
+          name: "奖励类型"
       claim_help:
         optional: "你可以认领此条目以防止他人审核。"
         required: "在你审核之前你必须认领此条目。"
@@ -863,7 +872,7 @@ zh_CN:
           default_name: "我的身份验证器"
         security_key:
           register: "注册"
-          delete: '删除'
+          delete: "删除"
       change_about:
         title: "更改个人信息"
         error: "提交修改时出错了"
@@ -890,8 +899,7 @@ zh_CN:
         upload_title: "上传图片"
         image_is_not_a_square: "注意：图片不是正方形的，我们裁剪了部分图像。"
       change_profile_background:
-        title: "个人档背景"
-        instructions: "显示在个人资料页面中，上传的图片将被居中且默认宽度为 850px。"
+        title: "个人档头部"
       change_card_background:
         title: "用户卡背景"
         instructions: "显示在用户卡片中，上传的图片将被居中且默认宽度为 590px。"
@@ -1123,6 +1131,9 @@ zh_CN:
       title:
         title: "头衔"
         none: "（无）"
+      primary_group:
+        title: "主要群组"
+        none: "（无）"
       filters:
         all: "全部"
       stream:
@@ -1158,6 +1169,7 @@ zh_CN:
       enabled: "站点正处于只读模式。你可以继续浏览，但是回复、赞和其他操作暂时被禁用。"
       login_disabled: "只读模式下不允许登录。"
       logout_disabled: "站点在只读模式下无法登出。"
+    too_few_topics_notice: "让我们<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论</a>吧！现在有<strong>%{currentTopics}</strong>个主题。 用户需要进行更多阅读与回复 – 我们推荐至少<strong>%{requiredTopics}</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}}。"
@@ -1254,6 +1266,10 @@ zh_CN:
       second_factor_description: "请输入来自 app 的验证码："
       second_factor_backup_title: "两步验证备份"
       second_factor_backup_description: "请输入你的备份码："
+      security_key_alternative: "找不到您的安全密钥，是否要使用其他方法？"
+      security_key_authenticate: "使用安全密钥进行身份验证"
+      security_key_not_allowed_error: "安全密钥验证超时或被取消。"
+      security_key_no_matching_credential_error: "在提供的安全密钥中找不到匹配的凭据。"
       email_placeholder: "电子邮件或者用户名"
       caps_lock_warning: "大写锁定开启"
       error: "未知错误"
@@ -1320,6 +1336,7 @@ zh_CN:
       apple_international: "Apple/国际化"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels （曾用名EmojiOne）"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1452,7 +1469,7 @@ zh_CN:
       link_description: "输入链接描述"
       link_dialog_title: "插入链接"
       link_optional_text: "可选标题"
-      link_url_placeholder: "https://example.com"
+      link_url_placeholder: "粘贴URL或键入以搜索主题"
       quote_title: "引用"
       quote_text: "引用"
       code_title: "预格式化文本"
@@ -2113,6 +2130,9 @@ zh_CN:
         image_upload_not_allowed_for_new_user: "抱歉，新用户无法上传图片。"
         attachment_upload_not_allowed_for_new_user: "抱歉，新用户无法上传附件。"
         attachment_download_requires_login: "抱歉，你需要登录后才能下载附件。"
+      abandon_edit:
+        no_value: "不，保持"
+        no_save_draft: "不，保存草稿"
       abandon:
         confirm: "确定要放弃编辑帖子吗？"
         no_value: "否"
@@ -2249,7 +2269,6 @@ zh_CN:
       tags_allowed_tags: "限制这些标签只能用在此分类"
       tags_allowed_tag_groups: "限制这些标签组只能用在此分类"
       tags_placeholder: "（可选）允许使用的标签列表"
-      tags_tab_description: "这里的标签和标签组只在这个分类以及其他手动添加了这些标签的分类下面可见。这些标签对剩余的分类是不可见的。"
       tag_groups_placeholder: "（可选）允许使用的标签组列表"
       manage_tag_groups_link: "管理这里的标签组。"
       allow_global_tags_label: "总是允许其它标题"
@@ -2862,7 +2881,6 @@ zh_CN:
               description: "管理员可以查看所有群组的成员。"
           membership:
             automatic: 自动
-            trust_level: 信任等级
             trust_levels_title: "这些用户加入时，将自动赋予信任等级："
             trust_levels_none: "无"
             automatic_membership_email_domains: "用户注册时邮箱域名若与列表完全匹配则自动添加至这个群组："
@@ -3866,6 +3884,8 @@ zh_CN:
           dashboard: "仪表盘"
         secret_list:
           invalid_input: "输入字段不能为空或包含竖线字符。"
+        default_categories:
+          modal_yes: "是"
       badges:
         title: 徽章
         new_badge: 新徽章
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index c875f7ff22..1966221da9 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -820,7 +820,7 @@ zh_TW:
         edit: "編輯"
         security_key:
           register: "註冊"
-          delete: '刪除'
+          delete: "刪除"
       change_about:
         title: "修改關於我"
         error: "修改設定值時發生錯誤"
@@ -846,9 +846,6 @@ zh_TW:
         uploaded_avatar_empty: "新增一張自訂圖片"
         upload_title: "上傳你的圖片"
         image_is_not_a_square: "警告：我們裁切了你的圖片，因為該圖片不是正方形的。"
-      change_profile_background:
-        title: "基本資料背景圖案"
-        instructions: "個人資料背景會被置中，且默認寬度為850px。"
       change_card_background:
         title: "使用者卡背景"
         instructions: "背景會被置中，且默認寬度為850px。"
@@ -1076,6 +1073,9 @@ zh_TW:
       title:
         title: "頭銜"
         none: "(無)"
+      primary_group:
+        title: "主要群組"
+        none: "(無)"
       filters:
         all: "全部"
       stream:
@@ -1388,7 +1388,6 @@ zh_TW:
       link_description: "在此輸入超連結的描述"
       link_dialog_title: "插入超連結"
       link_optional_text: "標題 (可選填)"
-      link_url_placeholder: "https://example.com"
       quote_title: "引用"
       quote_text: "引用"
       code_title: "預先格式化文字"
@@ -2024,6 +2023,8 @@ zh_TW:
         image_upload_not_allowed_for_new_user: "抱歉，新使用者不可上傳圖片。"
         attachment_upload_not_allowed_for_new_user: "抱歉，新使用者不可上傳附件。"
         attachment_download_requires_login: "抱歉，您必須登入以下載附件。"
+      abandon_edit:
+        no_value: "不，我要保留。"
       abandon:
         confirm: "你確定要捨棄你的貼文嗎?"
         no_value: "否"
@@ -2156,7 +2157,6 @@ zh_TW:
       tags_allowed_tags: "將這些標籤（Tags）限制為此分類做使用："
       tags_allowed_tag_groups: "將這些標籤群組限制在此類別使用："
       tags_placeholder: "（可選）允許使用的標籤列表"
-      tags_tab_description: "此處指定的標記和標記群組僅在此類別以及也指定它們的其他類別中可用。它們不可用於其他類別。"
       tag_groups_placeholder: "（可選）允許使用的標籤組列表"
       manage_tag_groups_link: "在此處管理標籤群組。"
       allow_global_tags_label: "也允許其他標籤（Tags）"
@@ -2745,7 +2745,6 @@ zh_TW:
               staff: "群組管理人及管理人員"
           membership:
             automatic: 自動
-            trust_level: 信任等級
             trust_levels_title: "當這些成員加入時，自動提升信任等級："
             trust_levels_none: "無"
             automatic_membership_email_domains: "當註冊使用者的電子郵件所屬網域，完全符合列表裡某項時，將會自動加進這個群組裡："
@@ -3715,6 +3714,8 @@ zh_TW:
           dashboard: "控制面板"
         secret_list:
           invalid_input: "輸入欄位不能為空或包含垂直字元"
+        default_categories:
+          modal_yes: "是"
       badges:
         title: 徽章
         new_badge: 新徽章
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 3cc9986c78..f2adf79e85 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -47,7 +47,6 @@ ar:
         no_message_id_error: "يحدث عندما لا يحتوي البريد ترويسة ’Message-Id‘."
         no_body_detected_error: "يحدث عندما يتعذّر استخراج المتن وعدم وجود مرفقات."
         inactive_user_error: "يحدث عندما يكون المرسل خاملًا."
-        bad_destination_address: "يحدث عندما لا تتطابق عناوين البريد في حقول ”إلى/ن‌ك/ن‌ك‌م“ أحد عناوين البريد الوارد المضبوطة."
         strangers_not_allowed_error: "يحدث عندما يحاول العضو إنشاء موضوع جديد في قسم و هو ليس عضوًا به."
         insufficient_trust_level_error: "يحدث عندما يحاول العضو إنشاء موضوع جديد في قسم و هو لا يملك مستوى الثّقة المطلوب لذلك."
         reply_user_not_matching_error: "يحدث عندما يأتي الرّدّ من بريد إلكترونيّ مختلف عن الذي أُرسل إليه الإشعار."
@@ -588,7 +587,6 @@ ar:
     missing_session: "لا نستظيع تحديد اذا كان حسابك قد أنشئ. رجاء التأكد من أن (الكوكيز) بالمتصفح الذى تستخدمة منشطة."
     admin_confirm:
       title: "تاكيد حساب المدير"
-      description: "أمتأكّد من جعل <b>%{target_username}</b> مديرًا؟"
       grant: "اجعلة مُديراً"
       complete: "المستخدم <b>%{target_username}</b> مدير الآن."
       back_to: "العودة إلي %{title}"
@@ -1183,7 +1181,7 @@ ar:
     embed_post_limit: "أقصى عدد للمشاركات المضمنة."
     embed_username_required: "إسم المستخدم مطلوب لإضافة مقالة"
     show_create_topics_notice: "إذا كان الموقع يحتوي على أقل من 5 مواضيع عامة , إظهار إشعار مطالبة المسؤولين إنشاء بعض المواضيع."
-    delete_drafts_older_than_n_days: حذف المسودات مضى عليها أكثر من (ن) يوما.
+    delete_drafts_older_than_n_days: "حذف المسودات مضى عليها أكثر من (ن) يوما."
     prevent_anons_from_downloading_files: "امنع المستخدمين المجهولين من تحميل المرفقات. تحذير:سوف تمنع اي شخص ليس لديه صوره موقع اصول نشره كمرفقات من العمل."
     slug_generation_method: "اختر طريقه توليد سبيكه . 'مشفره' سوف تقوم بتوليد سلسله مئويه مشفره.'لاشي' سوف يعطل السبيكه"
     enable_emoji: "فعّل الإيموجي"
@@ -1332,11 +1330,6 @@ ar:
     subject_template: "أكّد عدم رغبتك بعد الآن باستقبال تحديثات %{site_title} على البريد"
   invite_password_instructions:
     subject_template: "اضبط كلمة سرّ لحسابك على %{site_name}"
-  admin_confirmation_mailer:
-    text_body_template: |
-      رجاء أكّد رغبتك بإضافة **%{target_username}** كمدير لمنتداك.
-
-      [أكّد حساب المدير](%{admin_confirm_url})
   new_version_mailer:
     subject_template: "[%{email_prefix}] إصدارة دسكورس جديدة، ثمّة تحديث متوفّر"
   flag_reasons:
@@ -1505,7 +1498,6 @@ ar:
     missing: "نأسف، لم نعثر على أيّ صورة رمزيّة مرتبطة بعنوان البريد هذا. هلّا أعدت رفعها ثانيةً؟"
   flag_reason:
     sockpuppet: "عضو جديد نشر موضوع جديد ثم قام عضو جديد اخر له نفس الIP (%{ip_address}) بالرد علية. انظر إعدادات<a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان. انظر إعدادات <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     user_email_no_user: "تعذّر العثور على مستخدم معرّفه %{user_id}"
     user_email_post_not_found: "تعذر إيجاد المشاركة ذات المعرف %{post_id}"
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 8bd9573a36..ee28bbe1ee 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -79,7 +79,6 @@ be:
         from_reply_by_address_error: "Здараецца, калі з загалоўка адпавядае адказ па адрасе электроннай пошты."
         inactive_user_error: "Здараецца, калі адпраўнік не з'яўляецца актыўным."
         silenced_user_error: "Здараецца, калі адпраўнік быў падаўлены."
-        bad_destination_address: "Здараецца, калі ні адзін з адрасоў электроннай пошты ў поле Каму"
         strangers_not_allowed_error: "Здараецца, калі карыстальнік спрабаваў стварыць новую тэму ў катэгорыі яны не член."
         insufficient_trust_level_error: "Здараецца, калі карыстальнік спрабаваў стварыць новую тэму ў катэгорыі яны не маюць неабходны ўзровень даверу для."
         reply_user_not_matching_error: "Здараецца, калі адказ прыйшоў з іншага адрасу электроннай пошты апавяшчэнне было накіравана."
@@ -465,7 +464,6 @@ be:
     activated: "На жаль, гэты конт ужо быў актываваны."
     admin_confirm:
       title: "Пацвярджэнне акаўнта адміністратара"
-      description: "Вы ўпэўненыя, што жадаеце каб<b>%{target_username}</b> быў адміністратарам?"
       grant: "Дараваць доступ адміністратара"
       complete: "<b>%{target_username}</b> зараз адмін."
       back_to: "Вяртанне да %{title}"
@@ -1299,7 +1297,7 @@ be:
     embed_username_required: "Імя карыстальніка для стварэння тэмы патрабуецца."
     notify_about_flags_after: "Калі ёсць сцягі, якія не былі апрацаваны пасля гэтага шмат гадзін, адправіць асабістае паведамленне для мадэратараў. Усталюйце 0, каб адключыць."
     show_create_topics_notice: "Калі сайт мае менш за 5 грамадскія тэма, паказаць апавяшчэнне з просьбай адмін стварыць некаторыя тэмы."
-    delete_drafts_older_than_n_days: Выдаліць чарнавікі старэй (п) дзён.
+    delete_drafts_older_than_n_days: "Выдаліць чарнавікі старэй (п) дзён."
     bootstrap_mode_min_users: "Мінімальная колькасць карыстальнікаў, неабходных для адключэння рэжыму пачатковай загрузкі (вызначана нацыянальным 0, каб адключыць)"
     prevent_anons_from_downloading_files: "Забарона ананімных карыстальнікаў загрузкі укладанняў. ПАПЯРЭДЖАНЬНЕ: гэта дазволіць прадухіліць любыя актывы сайта без малюнкаў, размешчаных у выглядзе укладанняў ад працы."
     slug_generation_method: "Выбар спосабу генерацыі кулі. «Закадаваны» будзе генераваць працэнт радок кадавання. «Ніхто» не адключыць смоўж наогул."
@@ -1735,12 +1733,6 @@ be:
     visit_link_to_respond_pm: "[Наведаць паведамленне] (% {base_url}% {URL}), каб адказаць на% {удзельнікаў}."
     posted_by: "Паведамленне ад% {імя карыстальніка} на {%} POST_DATE"
     pm_participants: "Удзельнікі:% {ўдзельнікі}"
-    invited_group_to_private_message_body: |-
-      % {Імя карыстальніка} запрасіў @% {GROUP_NAME} да паведамлення> **% {TOPIC_TITLE} **>>% {Topic_excerpt}у>% {SITE_TITLE} - {%} site_description
-    invited_to_private_message_body: |-
-      % {Імя карыстальніка} запрасіў вас да паведамлення> **% {TOPIC_TITLE} **>>% {Topic_excerpt}у>% {SITE_TITLE} - {%} site_description
-    invited_to_topic_body: |-
-      % {Імя карыстальніка} запрасіў вас да абмеркавання> **% {TOPIC_TITLE} **>>% {Topic_excerpt}у>% {SITE_TITLE} - {%} site_description
     user_invited_to_private_message_pm_group:
       title: "Карыстальнік Запрошаныя групе PM"
       subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрасіў @% {GROUP_NAME} на паведамленне '% {TOPIC_TITLE}'"
@@ -1952,7 +1944,6 @@ be:
     missing: "На жаль, мы не можам знайсці якія-небудзь аватар, звязаны з гэтым адрасам электроннай пошты. Вы можаце паспрабаваць загрузіць яго зноў?"
   flag_reason:
     sockpuppet: "Новы карыстальнік стварыў тэму, і яшчэ адзін новы карыстальнік у тым жа IP-адрасе (% {ip_address}) адказаў. См% Класс <A HREF = '{базовый_путь}"
-    spam_hosts: "Гэты новы карыстальнік спрабаваў стварыць некалькі пастоў з спасылкамі на адной і той жа вобласці. См% Класс <A HREF = '{базовый_путь}"
   skipped_email_log:
     exceeded_emails_limit: "перавышаны max_emails_per_day_per_user"
     exceeded_bounces_limit: "перавышаны bounce_score_threshold"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index bbe48203c8..0cb619c736 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -452,6 +452,8 @@ bg:
       every_hour: "почасово"
       daily: "дневно"
       weekly: "седмично"
+      every_month: "всеки месец"
+      every_six_months: "на всеки шест месеца"
   user_api_key:
     read: "четене"
     otp_confirmation:
@@ -873,7 +875,7 @@ bg:
     embed_truncate: "Премахване на вградените публикации."
     embed_post_limit: "Максимален брой публикации за вграждане."
     show_create_topics_notice: "Ако на сайта има по-малко от 5 теми, покажи на персонала съобщение с молба за създаване на още теми."
-    delete_drafts_older_than_n_days: Изтрий чернови по-стари от (n) дни.
+    delete_drafts_older_than_n_days: "Изтрий чернови по-стари от (n) дни."
     prevent_anons_from_downloading_files: "Предотврати свалянето на приложения от анонимни потребители. ВНИМАНИЕ: това ще попречи на работата на всички авоари ,които са публикувани на сайта като приложения без изображения. "
     slug_generation_method: "Изберете метод за генериране на URL. 'кодирано' ще използва букви URL, кодирани с проценти. 'не' ще откаже генерацията като цяло."
     enable_emoji: "Разреши емотикони"
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 15d89c4136..610bf86559 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -91,7 +91,6 @@ bs_BA:
         from_reply_by_address_error: "Događa se kada se zaglavlje From poklapa s odgovorom na adresu e-pošte."
         inactive_user_error: "Dešava se kada pošiljalac nije aktivan."
         silenced_user_error: "Dešava se kada je pošiljalac utišan."
-        bad_destination_address: "Dešava se kada se nijedna adresa e-pošte u poljima To / Cc / Bcc ne podudara sa konfiguriranom dolaznom adresom e-pošte."
         strangers_not_allowed_error: "Dešava se kada je korisnik pokušao da kreira novu temu u kategoriji u kojoj nije član."
         insufficient_trust_level_error: "Dešava se kada korisnik pokuša da kreira novu temu u kategoriji za koju nema potreban nivo pouzdanosti."
         reply_user_not_matching_error: "Događa se kada je stigao odgovor s druge adrese e-pošte na koju je obavijest poslana."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 594ae1fc51..e074b51ae5 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -49,6 +49,7 @@ ca:
       about_json_values: "about.json conté valors no vàlids: %{errors}"
       git: "S'ha produït un error clonant el dipòsit git, s'ha denegat l'accés o no s'ha trobat el dipòsit."
       unpack_failed: "Error en desempaquetar el fitxer"
+      file_too_big: "El fitxer sense comprimir és massa gran."
       unknown_file_type: "El fitxer que heu pujat no sembla una aparença de Discourse vàlid."
     errors:
       component_no_user_selectable: "Els components de l'aparença no poden ser seleccionables per l'usuari."
@@ -91,7 +92,6 @@ ca:
         from_reply_by_address_error: "Passa quan la capçalera del remitent coincideix amb l'adreça de correu de resposta."
         inactive_user_error: "Passa quan l'emissor no és actiu."
         silenced_user_error: "Passa quan el remitent ha estat silenciat."
-        bad_destination_address: "Passa quan cap de les adreces de correu en els camps A/CC/CCO no coincideix amb una adreça entrant configurada."
         strangers_not_allowed_error: "Passa quan un usuari ha provat de crear un tema nou en una categoria de la qual no és membre."
         insufficient_trust_level_error: "Passa quan un usuari ha provat de crear un tema nou en una categoria per a la qual no té el nivell de confiança necessari."
         reply_user_not_matching_error: "Passa quan una resposta arriba des d'una adreça de correu diferent d'aquella a la qual s'ha enviat la notificació."
@@ -209,7 +209,11 @@ ca:
   email_template_cant_be_modified: "Aquesta plantilla de correu no es pot modificar."
   invalid_whisper_access: "O bé els xiuxiuejos no estan activats o bé no teniu permís per a crear-ne."
   not_in_group:
-    join_group: "Uneix-te al grup"
+    title_topic: "Per a veure aquest tema heu d’estar en grup."
+    title_category: "Per a veure aquesta categoria heu d’estar en un grup."
+    request_membership: "Sol·liciteu ser-ne membre"
+    join_group: "Uneix-me al grup"
+  deleted_topic: "Oh! Aquest tema s'ha suprimit i ja no està disponible."
   reading_time: "Temps de lectura."
   likes: "'M'agrada'"
   too_many_replies:
@@ -729,7 +733,6 @@ ca:
     activated: "Aquest compte ja ha estat activat."
     admin_confirm:
       title: "Confirma el compte d'administrador"
-      description: "Esteu segur que voleu que <b>%{target_username}</b> sigui administrador?"
       grant: "Atorga accés d'administrador"
       complete: "<b>%{target_username}</b> és ara administrador."
       back_to: "Torna a %{title}"
@@ -778,6 +781,9 @@ ca:
       description: "M'agrada aquesta publicació"
       short_description: "M'agrada aquesta publicació"
       long_form: "ha fet 'M'agrada'"
+  draft_backup:
+    pm_title: "Esborranys de còpia de seguretat de temes en curs"
+    pm_body: "Tema que conté esborranys de còpia de seguretat"
   user_activity:
     no_default:
       self: "Encara no teniu activitat."
@@ -793,6 +799,20 @@ ca:
       others: "No hi ha respostes."
     no_drafts:
       self: "No teniu cap esborrany. Comenceu a redactar una resposta en qualsevol tema i es desarà com a esborrany nou."
+  webauthn:
+    validation:
+      invalid_type_error: "El tipus de webauthn proporcionat no era vàlid. Els tipus vàlids són webauthn.get i webauthn.create."
+      challenge_mismatch_error: "El repte proporcionat no coincideix amb el repte generat pel servidor d’autenticació."
+      invalid_origin_error: "L’origen de la sol·licitud d’autenticació no coincideix amb l’origen del servidor."
+      malformed_attestation_error: "S'ha produït un error en descodificar les dades de la certificació."
+      invalid_relying_party_id_error: "L'identificador de relying party de la sol·licitud d'autenticació no coincideix amb l'identificador de relying party del servidor. "
+      user_verification_error: "La verificació de l’usuari és obligatòria."
+      unsupported_public_key_algorithm_error: "El servidor no admet l'algoritme de clau pública proporcionat."
+      unsupported_attestation_format_error: "El servidor no admet el format de certificació."
+      credential_id_in_use_error: "La identificació de credencial proporcionada ja està en ús."
+      public_key_error: "Ha fallat la verificació de la clau pública de la credencial."
+      ownership_error: "L'usuari no té la propietat de la clau de seguretat."
+      not_found_error: "No s'ha trobat una clau de seguretat amb l'identificador de credencial proporcionat."
   topic_flag_types:
     spam:
       title: "Brossa"
@@ -1266,7 +1286,7 @@ ca:
     editing_grace_period_max_diff_high_trust: "Nombre màxim de canvis de caràcter permesos en el període de gràcia d'edició. Si se'n canvien més, emmagatzema una altra revisió de publicació (nivells de confiança 2 i superiors)."
     staff_edit_locks_post: "Les publicacions seran blocades per a edició si són editades per membres de l'equip responsable."
     post_edit_time_limit: "Un autor tl0 o tl1 pot editar la seva publicació durant (n) minuts després de la publicació. Establiu el valor 0 perquè sigui per a sempre."
-    tl2_post_edit_time_limit: "Un autor de nivell de confiança 2 pot editar la seva publicació durant (n) minuts després de la publicació. Establiu el valor 0 perquè sigui per a sempre."
+    tl2_post_edit_time_limit: "Un autor de nivell de confiança 2 pot editar la seva publicació durant (n) minuts després de publicar. Establiu el valor 0 perquè sigui per a sempre."
     edit_history_visible_to_public: "Permet que qualsevol miri les versions prèvies d'una publicació editada. Si està desactivat, només seran visibles per a membres de l'equip responsable."
     delete_removed_posts_after: "Les publicacions eliminades per l'autor se suprimiran automàticament al cap de (n) hores. Si es posa 0, se suprimiran immediatament."
     max_image_width: "Amplada màxima de les miniatures d'imatges en una publicació"
@@ -1297,6 +1317,7 @@ ca:
     notification_email: "Adreça de correu en el \"de:\" emprada en enviar tots els correus essencials de sistema. El domini especificat aquí ha de tenir registres SPF, DKIM i PTR inversos, configurats correctament perquè arribi el correu."
     email_custom_headers: "Llista de capçaleres de correu personalitzades, delimitada amb barres verticals"
     email_subject: "Format d'assumpte personalitzable per a correus electrònics estàndard. Vegeu <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: "Proporciona més detalls als usuaris sobre per què no poden accedir a un tema concret. Nota: això és menys segur perquè els usuaris sabran si un URL enllaça amb un tema vàlid."
     enforce_second_factor: "Obliga els usuaris a habilitar l'autenticació de dos factors. Seleccioneu \"tots\" per a aplicar-ho a tots els usuaris. Seleccioneu \"equip responsable\" per a aplicar-ho sols als usuaris de l'equip responsable. "
     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."
@@ -1435,9 +1456,9 @@ ca:
     enable_github_logins: "Activa l'autenticació GitHub. Requereix github_client_id i github_client_secret. Vegeu <a href='https://meta.discourse.org/t/13745' target='_blank'>Configuració de l'inici de sessió de GitHub per a Discourse</a>."
     github_client_id: "Identificador del client per a l'autenticació GitHub, registrat en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Secret del client per a l'autenticació GitHub, registrat en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    enable_discord_logins: 'S''ha de permetre als usuaris autenticar-se mitjançant Discord?'
+    enable_discord_logins: "S'ha de permetre als usuaris autenticar-se mitjançant Discord?"
     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_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"
@@ -1750,7 +1771,7 @@ ca:
     embed_username_required: "Cal un nom d'usuari per a crear un tema."
     notify_about_flags_after: "Si hi ha banderes que no s'han gestionat després d'aquest nombre d'hores, envia un missatge personal als moderadors. 0 per desactivar."
     show_create_topics_notice: "Si el lloc web té menys de 5 temes públics, mostra un avís demanant als administradors que en creï uns quants. "
-    delete_drafts_older_than_n_days: Suprimeix esborranys amb més de (n) dies.
+    delete_drafts_older_than_n_days: "Suprimeix esborranys amb més de (n) dies."
     bootstrap_mode_min_users: "Nombre mínim d'usuaris necessaris per a desactivar el mode d'arrencada (deixeu-ho a 0 per a desactivar-lo)."
     prevent_anons_from_downloading_files: "Impedeix que els usuaris anònims puguin descarregar fitxers adjunts. ATENCIÓ: Això impedirà que funcioni cap fitxer que no sigui una imatge publicat com a adjunt."
     slug_generation_method: "Trieu un mètode de generació de slugs (adreces amigables). 'encoded' generarà una cadena amb codificacions %. 'none' anul·larà totalment l'adreça amigable."
@@ -1972,6 +1993,13 @@ ca:
     autoclosed_disabled_lastpost: "Aquest tema ara està obert. Es permeten més respostes."
     auto_deleted_by_timer: "S'ha suprimit automàticament per temporitzador."
   login:
+    security_key_description: "Quan tingueu preparada la vostra clau de seguretat física, premeu el botó Autentica amb clau de seguretat."
+    security_key_alternative: "¿No podeu trobar la vostra clau de seguretat o voleu utilitzar un altre mètode?"
+    security_key_authenticate: "Autenticació amb clau de seguretat"
+    security_key_not_allowed_error: "El procés d'autenticació de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
+    security_key_no_matching_credential_error: "No s'ha trobat cap credencial coincident amb la clau de seguretat proporcionada."
+    security_key_support_missing_error: "El vostre dispositiu o navegador actual no admet l'ús de claus de seguretat. Utilitzeu un mètode diferent."
+    security_key_invalid: "S'ha produït un error en validar la clau de seguretat."
     not_approved: "El vostre compte encara no ha estat aprovat. Us notificarem per correu quan podreu iniciar la sessió."
     incorrect_username_email_or_password: "Nom d'usuari, correu electrònic o contrasenya incorrectes"
     incorrect_password: "Contrasenya incorrecta"
@@ -2008,6 +2036,7 @@ ca:
     second_factor_backup_description: "Introduïu un dels vostres codis de còpia de seguretat:"
     second_factor_backup_title: "Codi de còpia de seguretat de dos factors"
     invalid_second_factor_code: "Codi d'autenticació no vàlid. Cada codi només es pot utilitzar una vegada."
+    invalid_security_key: "Clau de seguretat no vàlida."
     second_factor_toggle:
       totp: "Utilitzeu una aplicació d'autenticació en comptes d'això"
       backup_code: "Utilitzeu un codi de còpia de seguretat en comptes d'això"
@@ -2024,6 +2053,7 @@ ca:
       short: "ha de tenir almenys %{min} caràcters"
       long: "no ha de ser més llarg de %{max} caràcters"
       too_long: "és massa llarg"
+      characters: "ha d’incloure només xifres, lletres, guions, punts i guions baixos"
       unique: "ha de ser únic"
       blank: "ha de ser-hi present"
       must_begin_with_alphanumeric_or_underscore: "ha de començar amb una lletra, una xifra o un guió baix"
@@ -2091,10 +2121,6 @@ ca:
   admin_confirmation_mailer:
     title: "Confirmació d'administració"
     subject_template: "[%{email_prefix}] Confirmeu un nou compte d'administració"
-    text_body_template: |
-      Confirmeu que voleu afegir **%{target_username}** com a administrador del fòrum.
-
-      [Confirma el compte d'administrador](%{admin_confirm_url})
   test_mailer:
     title: "Test"
     subject_template: "[%{email_prefix}] Test de lliurament de correu electrònic"
@@ -2467,27 +2493,35 @@ ca:
     visit_link_to_respond_pm: "[Visita el missatge](%{base_url}%{url}) per a respondre a %{participants}."
     posted_by: "Publicat per %{username} en %{post_date}"
     pm_participants: "Participants: %{participants}"
-    invited_group_to_private_message_body: "%{username} ha convidat @%{group_name} a un missatge\n\n> **%{topic_title}**\n>\n> %{topic_excerpt} \n\nen\n\n> %{site_title} - %{site_description}\n"
+    invited_group_to_private_message_body: "%{username} ha convidat @%{group_name} a un missatge\n\n> **%{topic_title}(%{topic_url})**\n>\n> %{topic_excerpt} \n\nen\n\n> %{site_title} - %{site_description}\n\nPer a unir-vos al missatge, feu clic en l'enllaç:\n\n%{topic_url}\n"
     invited_to_private_message_body: |
       %{username} us ha convidat a un missatge
 
-      > **%{topic_title}**
+      > **%{topic_title}(%{topic_url})**
       >
       > %{topic_excerpt}
 
       en
 
       > %{site_title} -- %{site_description}
+
+      Per a unir-vos al missatge, feu clic en l'enllaç:
+
+      %{topic_url}
     invited_to_topic_body: |
       %{username} us ha convidat a una discussió
 
-      > **%{topic_title}**
+      > **%{topic_title}(%{topic_url})**
       >
       > %{topic_excerpt}
 
-      a
+      en
 
       > %{site_title} -- %{site_description}
+
+      Per a unir-vos a la discussió feu clic en l'enllaç:
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "L'usuari ha convidat el grup a MP"
       subject_template: "[%{email_prefix}] %{username} ha convidat @%{group_name} a un missatge '%{topic_title}'"
@@ -2781,7 +2815,7 @@ ca:
     missing: "No podem trobar cap avatar associat amb aquesta adreça de correu. Proveu de pujar-lo de nou."
   flag_reason:
     sockpuppet: "Un usuari nou ha creat un tema, i un altre usuari nou amb la mateixa adreça IP (%{ip_address}) hi ha respost. Mireu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> de la configuració del lloc web."
-    spam_hosts: "Aquest usuari nou ha creat moltes publicacions amb enllaços al mateix domini. Vegeu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> de la configuració del lloc web."
+    spam_hosts: "Aquest usuari nou ha creat moltes publicacions amb enllaços al mateix domini. Cal revisar totes les publicacions d'aquest usuari que contenen enllaços. Vegeu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> de la configuració del lloc web."
   skipped_email_log:
     exceeded_emails_limit: "S'ha excedit max_emails_per_day_per_user"
     exceeded_bounces_limit: "S'ha superat bounce_score_threshold"
@@ -3380,4 +3414,4 @@ ca:
   email_style:
     html_missing_placeholder: "La plantilla HTML ha d’incloure %{placeholder}"
   discord:
-    not_in_allowed_guild: 'L''autenticació ha fallat. No sou membre d’un gremi de Discord autoritzat.'
+    not_in_allowed_guild: "L'autenticació ha fallat. No sou membre d’un gremi de Discord autoritzat."
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 14589f9100..8bd03a3786 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -89,7 +89,6 @@ da:
         from_reply_by_address_error: "Det sker, når Fra-overskriften matcher svaret via e-mail-adresse."
         inactive_user_error: "Dette sker når afsenderen ikke er aktiv."
         silenced_user_error: "Det sker, når afsenderen er silenced."
-        bad_destination_address: "Dette sker når ingen af email adresserne i To/Cc/Bcc felterne matcher en opsat indgående email adresse."
         strangers_not_allowed_error: "Dette sker når en bruger prøver at oprette et nyt emne i en kategori som de ikke er medlem af."
         insufficient_trust_level_error: "Dette sker når en bruger prøvede at oprette et nyt emne i en kategori som de ikke har den krævne \"trust level\" til."
         reply_user_not_matching_error: "Dette sker når et svar kom fra en anden email adresse end den notifikationen blev sendt til."
@@ -588,7 +587,6 @@ da:
     activated: "Desværre, denne konto er allerede aktiveret."
     admin_confirm:
       title: "Bekræft Admin Konto"
-      description: "Er du sikker på du vil gøre <b>%{target_username}</b> til administrator?"
       grant: "Tildel Admin Adgang"
       complete: "<b>%{target_username}</b> er nu administrator."
       back_to: "Gå tilbage til %{title}"
@@ -1209,10 +1207,6 @@ da:
   admin_confirmation_mailer:
     title: "Bekræftelse af admin"
     subject_template: "[%{email_prefix}] Bekræft ny admin-konto"
-    text_body_template: |
-      Bekræft, at du vil tilføje **%{target_username}** som administrator til dit forum
-
-      [Godkend administratorkonto](%{admin_confirm_url})
   new_version_mailer:
     subject_template: "[%{email_prefix}] Ny version af Discourse, opdatering tilgængelig"
   new_version_mailer_with_notes:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 862a0be27d..0a2f196bad 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -92,7 +92,6 @@ de:
         from_reply_by_address_error: "Passiert wenn der From-Header mit der Antwort E-Mail-Adresse übereinstimmt."
         inactive_user_error: "Passiert wenn der Sender nicht aktiv ist."
         silenced_user_error: "Kommt vor, wenn der Absender stummgeschaltet wurde."
-        bad_destination_address: "Passiert wenn keine der E-Mail Adressen in den Feldern To/Cc/Bcc zu einer konfigurierten Eingangs-E-Mail-Adresse passt."
         strangers_not_allowed_error: "Passiert wenn ein Benutzer versuchte ein neues Thema in einer Kategorie ohne Mitgliedschaft zu erstellen."
         insufficient_trust_level_error: "Passiert wenn ein Benutzer versuchte ein neues Thema in einer Kategorie zu erstellen, ohne die erforderliche Vertrauensstufe dafür zu haben."
         reply_user_not_matching_error: "Passiert wenn die E-Mail-Adresse der Antwort von der Adresse abweicht, an die gesendet wurde."
@@ -714,7 +713,6 @@ de:
     activated: "Bitte entschuldige, dieses Konto wurde bereits aktiviert."
     admin_confirm:
       title: "Admnistrator-Konto bestätigen"
-      description: "Bist du sicher, dass <b>%{target_username}</b> ein Administrator sein soll?"
       grant: "Administrationsrechte vergeben"
       complete: "<b>%{target_username}</b> ist jetzt ein Administrator."
       back_to: "Zurück zu %{title}"
@@ -1251,7 +1249,6 @@ de:
     editing_grace_period_max_diff_high_trust: "Maximale Anzahl von Zeichenänderungen, die während der Bearbeitungsfrist erlaubt sind. Bei größeren Änderungen wird eine neue Beitragsversion gespeichert (Vertrauensstufe 2 und höher)"
     staff_edit_locks_post: "Beiträge werden für die Bearbeitung gesperrt, wenn sie von Team-Mitgliedern bearbeitet werden"
     post_edit_time_limit: "Autoren der Vertrauensstufen 0 und 1 können ihre Beiträge (n) Minuten nach dem Schreiben noch ändern. 0 bedeutet immer."
-    tl2_post_edit_time_limit: "Ein Autor der Vertrauensstufen 2 kann seine Beiträge (n) Minuten nach dem Schreiben noch ändern. 0 bedeutet immer."
     edit_history_visible_to_public: "Erlaube jedem, vorherige Versionen eines bearbeiteten Beitrags zu sehen. Wenn deaktiviert sind diese nur für Team-Mitglieder sichtbar."
     delete_removed_posts_after: "Beiträge, die deren Verfasser selbst entfernt hat, werden nach (n) Stunden automatisch gelöscht. Die Beiträge werden sofort gelöscht, wenn dieser Wert auf 0 gesetzt wird."
     max_image_width: "Maximale Breite von Thumbnails von Bildern in einem Beitrag."
@@ -1420,9 +1417,9 @@ de:
     enable_github_logins: "GitHub-Authentifizierung aktivieren, erfordert github_client_id und github_client_secret. Siehe <a href='https://meta.discourse.org/t/13745' target='_blank'>Configuring GitHub login for Discourse</a>."
     github_client_id: "Client-ID für GitHub-Authentifizierung, registriert auf <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Client-Secret für GitHub-Authentifizierung, registriert auf <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    enable_discord_logins: 'Benutzern erlauben, sich mit Discord zu authentifizieren?'
+    enable_discord_logins: "Benutzern erlauben, sich mit Discord zu authentifizieren?"
     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_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"
@@ -2145,10 +2142,6 @@ de:
   admin_confirmation_mailer:
     title: "Admin-Bestätigung"
     subject_template: "[%{email_prefix}] Bestätige neues Administrator-Konto"
-    text_body_template: |
-      Bitte bestätige, dass du **%{target_username}** als Administrator in deinem Forum hinzufügen möchtest.
-
-      [Administrator-Konto bestätigen](%{admin_confirm_url})
   test_mailer:
     title: "Test-E-Mail"
     subject_template: "[%{email_prefix}] Test der E-Mail-Zustellbarkeit"
@@ -2764,36 +2757,6 @@ de:
     visit_link_to_respond_pm: "[Rufe die Nachricht auf](%{base_url}%{url}) um %{participants} zu antworten."
     posted_by: "Erstellt von %{username} am %{post_date}"
     pm_participants: "Teilnehmer: %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} hat @%{group_name} eingeladen zu einer Nachricht
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} hat dich zu einer Unterhaltung eingeladen
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} hat dich zu einer Diskussion eingeladen
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Benutzer hat Gruppe zu Nachricht eingeladen"
       subject_template: "[%{email_prefix}] %{username} hat @%{group_name} zu einer Unterhaltung '%{topic_title}' eingeladen"
@@ -3170,7 +3133,6 @@ de:
     missing: "Hoppla, wir können kein Profilbild für diese E-Mail-Adresse finden. Kannst du versuchen es erneut hochzuladen?"
   flag_reason:
     sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP-Adresse (%{ip_address}) hat darauf geantwortet. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> Einstellung."
-    spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain zu schreiben. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>-Einstellung."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user überschritten"
     exceeded_bounces_limit: "bounce_score_threshold wurde überschritten"
@@ -4121,4 +4083,4 @@ de:
   email_style:
     html_missing_placeholder: "Die HTML Vorlage muss %{placeholder}beinhalten"
   discord:
-    not_in_allowed_guild: 'Authentifizierung fehlgeschlagen. Du bist kein Mitglied einer erlaubten Discord Gilde.'
+    not_in_allowed_guild: "Authentifizierung fehlgeschlagen. Du bist kein Mitglied einer erlaubten Discord Gilde."
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 83154ed945..0e57b3621e 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -49,7 +49,6 @@ el:
         no_sender_detected_error: "Συμβαίνει όταν δεν μπορεί να βρεθεί μία έγκυρη διεύθυνση email στο From header."
         inactive_user_error: "Συμβαίνει όταν ο αποστολέας είναι ανενεργός"
         silenced_user_error: "Συμβαίνει όταν ο αποστολέας έχει σιγηθεί."
-        bad_destination_address: "Συμβαίνει όταν καμία από τις διευθύνσεις email στα πεδία To/Cc/Bcc δεν αντιστοιχίζεται σε κάποια ρυθμισμένη διεύθυνση εισερχόμενων email."
         strangers_not_allowed_error: "Συμβαίνει όταν ο χρήστης προσπαθεί να δημιουργήσει ένα νέο θέμα σε κατηγορία που δεν είναι μέλος."
         insufficient_trust_level_error: "Συμβαίνει όταν ο χρήστης προσπαθεί να δημιουργήσει ένα νέο θέμα σε κατηγορία που δεν έχει το απαιτούμενο επίπεδο εμπιστοσύνης. "
         reply_user_not_matching_error: "Συμβαίνει όταν μια απάντηση έρθει από ένα διαφορετικό email από αυτό στο οποίο είχε σταλεί η ειδοποίηση."
@@ -505,7 +504,6 @@ el:
     activated: "Λυπάμαι, αυτός ο λογαριασμός έχει ήδη ενεργοποιηθεί."
     admin_confirm:
       title: "Επιβεβαίωση Λογαριασμού Διαχειριστή"
-      description: "Σίγουρα θέλετε να γίνει ο χρήστης <b>%{target_username}</b> διαχειριστής;"
       grant: "Παραχώρηση Δικαιωμάτων Διαχειριστή"
       complete: "<b>%{target_username}</b> είναι πλέον διαχειριστής."
       back_to: "Επιστροφή σε %{title}"
@@ -1456,11 +1454,6 @@ el:
   admin_confirmation_mailer:
     title: "Επικύρωση Διαχειριστή"
     subject_template: "[%{email_prefix}] Επιβεβαίωση νέου Λογαριασμού Διαχειριστή"
-    text_body_template: |2
-
-      Παρακαλούμε επιβεβαιώστε ότι θέλετε να προσθέστε τον **%{target_username}** ως διαχειριστή στην ιστοσελίδα σας.
-
-      [Επιβεβαίωση Λογαριασμού Διαχειριστή](%{admin_confirm_url})
   test_mailer:
     title: "Δοκιμαστική Αποστολή"
     subject_template: "[%{email_prefix}] Email Deliverability Test"
@@ -1822,45 +1815,6 @@ el:
     only_reply_by_email: "Απαντήστε σε αυτό το email για να αποκριθείς."
     visit_link_to_respond: "[Επισκέψου το νήμα](%{base_url}%{url}) για να αποκριθείς."
     posted_by: "Αναρτήθηκε από %{username} στις %{post_date}"
-    invited_group_to_private_message_body: |2
-
-      Ο/Η %{username} προσκάλεσε @%{group_name} σε ένα μήνυμα
-
-      > **%{topic_title}**
-
-      >
-
-      > %{topic_excerpt}
-
-      στην
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |2
-
-      %{username} σας προσκάλεσε σε ένα μήνυμα
-
-      > **%{topic_title}**
-
-      >
-
-      > %{topic_excerpt}
-
-      στην
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |2
-
-      %{username} σας προσκάλεσε σε μία συζήτηση
-
-      > **%{topic_title}**
-
-      >
-
-      > %{topic_excerpt}
-
-      στην
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Ο χρήστης προσκάλεσε ομάδα σε ΠΜ"
       subject_template: "[%{email_prefix}] %{username} προσκλήθηκε @%{group_name} σε ένα μήνυμα '%{topic_title}'"
@@ -2213,7 +2167,6 @@ el:
     missing: "Λυπούμαστε, αλλά δεν μπορέσαμε να βρούμε κάποιο άβαταρ που να αντιστοιχίζεται με τη συγκεκριμένη διεύθυνση email. Μπορείτε να δοκιμάσετε να το ανεβάσετε ξανά;"
   flag_reason:
     sockpuppet: "Ένας νέος χρήστης δημιούργησε ένα νήμα και ένας άλλος νέος χρήσης με την ίδια διεύθυνση IP (%{ip_address}) απάντησε. Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain. Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Υπέρβαση max_emails_per_day_per_user"
     exceeded_bounces_limit: "Υπέρβαση bounce_score_threshold"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index e4edd47efb..98b6a9272e 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -92,7 +92,7 @@ es:
         from_reply_by_address_error: "Ocurre cuando el encabezado remitente coincide con la respuesta por dirección de correo electrónico."
         inactive_user_error: "Sucede cuando el remitente no está activo."
         silenced_user_error: "Ocurre cuando el remitente ha sido silenciado."
-        bad_destination_address: "Sucede cuando ninguna de las direcciones de correo electrónico en los campos Para/Cc/Bcc coincide con un correo electrónico configurado como dirección de correo entrante."
+        bad_destination_address: "Sucede cuando ninguna de las direcciones de correo electrónico en los campos Para/Cc coincide con un correo electrónico configurado como dirección de correo entrante."
         strangers_not_allowed_error: "Sucede cuando un usuario intenta crear un nuevo tema en una categoría de la que no forma parte."
         insufficient_trust_level_error: "Sucede cuando un usuario intenta crear un nuevo tema en una categoría para la cual no tiene el nivel de confianza requerido."
         reply_user_not_matching_error: "Sucede cuando una respuesta viene de una dirección de correo electrónico diferente a la que se le envió la notificación."
@@ -161,6 +161,7 @@ es:
         one: "Has especificado la opción inválida %{name}"
         other: "Especificaste las opciones inválidas %{name}"
       default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista."
+      default_tags_already_selected: "No puedes seleccionar una etiqueta utilizada en otra lista."
       s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a «s3_upload_bucket»."
       enable_s3_uploads_is_required: "No puedes activar el inventario en S3 a menos que se haya habilitado las subidas en S3."
       s3_backup_requires_s3_settings: "No puedes usar S3 como método de respaldo salvo que hayas rellenado «%{setting_name}»."
@@ -206,11 +207,15 @@ es:
   provider_not_enabled: "No tienes permitido visualizar el recurso solicitado. El proveedor de autenticación no está habilitado."
   provider_not_found: "No tienes permitido visualizar el recurso solicitado. El proveedor de autenticación no existe."
   read_only_mode_enabled: "El sitio está en modo solo lectura. Las interacciones están deshabilitadas."
-  invalid_grant_badge_reason_link: "El enlace externo o inválido de discourse no está permitido como motivo de la insignia."
+  invalid_grant_badge_reason_link: "El enlace externo o inválido de discourse no está permitido como motivo de la medalla."
   email_template_cant_be_modified: "Esta plantilla de correo electrónico no se puede modificar"
   invalid_whisper_access: "O los susurros no están habilitados o no tienes permitido crear susurros"
   not_in_group:
+    title_topic: "Debes estar en grupo para ver este tema."
+    title_category: "Debes estar en grupo para ver esta categoría."
+    request_membership: "Solicitar membresía"
     join_group: "Unirse al grupo"
+  deleted_topic: "¡Ups! Este tema se ha eliminado y ya no está disponible."
   reading_time: "Tiempo de lectura"
   likes: "Me gusta"
   too_many_replies:
@@ -229,8 +234,8 @@ es:
     no_hosts: "No se han definido hosts para el insertado"
     configure: "Configurar insertado"
     more_replies:
-      one: "otra respuesta"
-      other: "otras %{count} respuestas"
+      one: "%{count} respuesta más"
+      other: "%{count} respuestas más"
     loading: "Cargando discusión..."
     permalink: "Enlace permanente"
     imported_from: "Este es un tema de discusión derivado de la entrada %{link}"
@@ -305,7 +310,7 @@ es:
     user_posts: "Publicaciones recientes de @%{username}"
     user_topics: "Temas recientes de @%{username}"
     tag: "Temas etiquetados"
-    badge: "%{display_name} insignia en %{site_title}"
+    badge: "%{display_name} medalla en %{site_title}"
   too_late_to_edit: "Esa publicación se publicó hace demasiado tiempo. No se puede editar ni eliminar."
   edit_conflict: "La publicación ha sido editada por otro usuario y tus cambios no se pueden guardar."
   revert_version_same: "La versión actual es la misma que la versión a la que intentas volver."
@@ -362,9 +367,9 @@ es:
 
       - Sé amable con tus compañeros, miembros de la comunidad.
 
-      - Las críticas constructivas son bienvenidas, pero recuerda criticar las *ideas*, no las personas.
+      - Las críticas constructivas son bienvenidas, pero recuerda criticar las *ideas*, no a las personas.
 
-      Para más consejos, [visita las directrices de la comunidad](%{base_path}/guidelines). Este panel solo aparecerá para tus primeros %{education_posts_text}.
+      Para más consejos, [visita las directrices de la comunidad](%{base_path}/guidelines). Este panel solo aparecerá para tus primeras %{education_posts_text}.
     avatar: |
       ### ¿Que tal si agregas una imagen para tu cuenta?
 
@@ -730,7 +735,6 @@ es:
     activated: "Disculpa, esta cuenta ya fue activada."
     admin_confirm:
       title: "Confirmar cuenta de administrador"
-      description: "¿Estás seguro de que quieres que <b>%{target_username}</b> sea un administrador?"
       grant: "Conceder acceso de administrador"
       complete: "<b>%{target_username}</b> ahora es un administrador."
       back_to: "Volver al %{title}"
@@ -779,6 +783,13 @@ es:
       description: "Me gusta esta publicación"
       short_description: "Me gusta esta publicación"
       long_form: "Me gusta esto"
+  draft:
+    sequence_conflict_error:
+      title: "error de borrador"
+      description: "El borrador está siendo editado en otra ventana. Por favor refresca esta página."
+  draft_backup:
+    pm_title: "Borradores de respaldo de temas en curso"
+    pm_body: "Tema que contiene borradores de respaldo"
   user_activity:
     no_default:
       self: "No tienes actividad aún."
@@ -796,18 +807,18 @@ es:
       self: "No tienes ningún borrador; empieza a escribir una respuesta en cualquier tema y se guardará automáticamente como nuevo borrador."
   webauthn:
     validation:
-      invalid_type_error: 'El proveedor tipo webauthn provisto es inválido. Los tipos válidos son webauthn.get y webauthn.create.'
-      challenge_mismatch_error: 'El desafío provisto no coincide con el desafío generado por el servidor de autenticación.'
-      invalid_origin_error: 'El origen de la solicitud de autenticación no coincide con el origen del servidor.'
-      malformed_attestation_error: 'Se produjo un error al decodificar los datos de certificación.'
-      invalid_relying_party_id_error: 'La ID de la parte confiante de la solicitud de autenticación no coincide con la ID de la parte confiante del servidor.'
-      user_verification_error: 'Se requiere la verificación del usuario.'
-      unsupported_public_key_algorithm_error: 'El servidor no soporta el algoritmo de clave pública provisto.'
-      unsupported_attestation_format_error: 'El servidor no soporta el formato de certificación.'
-      credential_id_in_use_error: 'La ID de la credencial provista ya está siendo utilizada.'
-      public_key_error: 'La verificación de la clave pública para la credencial falló.'
-      ownership_error: 'La clave de seguridad no le pertenece al usuario.'
-      not_found_error: 'No se encontró ninguna clave de seguridad con la ID de la credencial provista.'
+      invalid_type_error: "El proveedor tipo webauthn provisto es inválido. Los tipos válidos son webauthn.get y webauthn.create."
+      challenge_mismatch_error: "El desafío provisto no coincide con el desafío generado por el servidor de autenticación."
+      invalid_origin_error: "El origen de la solicitud de autenticación no coincide con el origen del servidor."
+      malformed_attestation_error: "Se produjo un error al decodificar los datos de certificación."
+      invalid_relying_party_id_error: "La ID de la parte confiante de la solicitud de autenticación no coincide con la ID de la parte confiante del servidor."
+      user_verification_error: "Se requiere la verificación del usuario."
+      unsupported_public_key_algorithm_error: "El servidor no soporta el algoritmo de clave pública provisto."
+      unsupported_attestation_format_error: "El servidor no soporta el formato de certificación."
+      credential_id_in_use_error: "La ID de la credencial provista ya está siendo utilizada."
+      public_key_error: "La verificación de la clave pública para la credencial falló."
+      ownership_error: "La clave de seguridad no le pertenece al usuario."
+      not_found_error: "No se encontró ninguna clave de seguridad con la ID de la credencial provista."
   topic_flag_types:
     spam:
       title: "Spam"
@@ -841,7 +852,7 @@ es:
         remove: "Este tema ya no funciona como encabezado. Ya no aparecerá en la parte superior de cada página."
   unsubscribed:
     title: "¡Preferencias de correo electrónico actualizadas!"
-    description: "las preferencias de correo electrónico para <b>%{email}</b> han sido actualizadas. Para cambiar tus configuraciones de correo electrónico, <a href='%{url}'>ve a tus preferencias de usuario</a>."
+    description: "las preferencias de correo electrónico para <b>%{email}</b> han sido actualizadas. Para cambiar tus configuraciones de correo electrónico, <a href='%{url}'>visita tus preferencias de usuario</a>."
     topic_description: "Para volver a suscribirte a %{link}, cambia los ajustes de notificación en la parte inferior o en la parte derecha del tema."
     private_topic_description: "Para volver a suscribirte, cambia los ajustes de notificación en la parte inferior o en la parte derecha del tema."
   unsubscribe:
@@ -1035,7 +1046,7 @@ es:
         term: Término
         searches: Búsquedas
         click_through: CTR
-      description: "Términos de búsqueda más populares con sus porcentajes de clic"
+      description: "Términos de búsqueda más populares con sus porcentajes de clic."
     emails:
       title: "Correos electrónicos enviados"
       xaxis: "Día"
@@ -1080,7 +1091,7 @@ es:
         user: "Usuario"
         num_clicks: "Clics"
         num_topics: "Temas"
-      description: "Usuarios listados por número de clics en enlaces que han compartido"
+      description: "Usuarios listados por número de clics en enlaces que han compartido."
     top_traffic_sources:
       title: "Mayores fuentes de tráfico"
       xaxis: "Dominio"
@@ -1190,7 +1201,7 @@ es:
         user: Usuario
         location: Ubicación
         login_at: Inicio de sesión a las
-      description: "Lista de inicios de sesión de administradores con su ubicación"
+      description: "Lista de inicios de sesión de administradores con su ubicación."
     top_uploads:
       title: "Top archivos subidos"
       labels:
@@ -1281,7 +1292,7 @@ es:
     editing_grace_period_max_diff_high_trust: "Número máximo de cambios de caracteres permitidos en el período de gracia de edición, si hay más cambios, almacenar otra revisión de publicación (nivel de confianza 2 y superiores)"
     staff_edit_locks_post: "Se bloqueará la posibilidad de editar publicaciones si estas son editadas por un miembro del staff."
     post_edit_time_limit: "Un autor con nivel de confianza 0 o 1 puede editar sus publicaciones hasta (n) minutos después de su creación. Poner a 0 para permitir ediciones siempre."
-    tl2_post_edit_time_limit: "Un autor con nivel de confianza 2 o más puede editar sus publicaciones hasta (n) minutos después de su creación. Poner a 0 para permitir ediciones siempre."
+    tl2_post_edit_time_limit: "Un autor con NC2 puede editar su publicación durante (n) minutos luego de publicarla. Establece el valor en 0 para que siempre pueda hacerlo."
     edit_history_visible_to_public: "Permitir a todos ver las versiones previas de una publicación editada. Si se deshabilita, solo los miembros del staff podrán verlas."
     delete_removed_posts_after: "Las publicaciones eliminadas por su autor se eliminarán automáticamente después de (n) horas. Si se establece este valor a 0, las publicaciones se eliminarán inmediatamente."
     max_image_width: "Anchura máxima de las miniaturas de las imágenes en una publicación"
@@ -1312,6 +1323,7 @@ es:
     notification_email: "La dirección de correo electrónico remitente utilizada al enviar todos los correos electrónicos esenciales de sistema. El dominio especificado debe tener correctamente configurados los registros SPF, DKIM y PTR inversos para que los correos electrónicos se reciban correctamente."
     email_custom_headers: "Lista de correos electrónicos separados por barras"
     email_subject: "Formato de asunto personalizable para correos electrónicos estándar. Revisa <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: "Proporciona más detalles a los usuarios acerca de por qué no pueden acceder a un tema en particular. Nota: esto es menos seguro dado que los usuarios sabrán si una URL enlaza a un tema válido."
     enforce_second_factor: "Obliga a usar la autenticación en dos pasos. Selecciona «all» para obligar a todos los usuarios. Selecciona «staff» para obligar solo a los miembros del staff."
     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. "
@@ -1392,7 +1404,7 @@ es:
     prioritize_username_in_ux: "Mostrar el nombre de usuario primero en la página de usuario, tarjeta de usuario y publicaciones (cuando está desactivado, el nombre se muestra primero)"
     enable_rich_text_paste: "Habilitar conversión automática de HTML a Markdown al pegar texto en el compositor. (Experimental)"
     email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas."
-    enable_badges: "Activar el sistema de insignias"
+    enable_badges: "Activar el sistema de medallas"
     enable_whispers: "Permitir que los miembros del staff se comuniquen entre ellos en privado dentro de los temas."
     allow_index_in_robots_txt: "Especificar en robots.txt que se permite que este sitio sea indexado por los motores de búsqueda en Internet. En casos excepcionales, puedes <a href='%{base_path}/admin/customize/robots'>sobrescribir robots.txt</a> permanentemente."
     email_domains_blacklist: "Una lista de dominios de correo electrónico que los usuarios no pueden utilizar para registrarse. Ejemplo: mailinator.com|trashmail.net"
@@ -1450,9 +1462,9 @@ es:
     enable_github_logins: "Activar autenticación mediante Github, requiere una github_client_id y un github_client_secret. Ver <a href='https://meta.discourse.org/t/13745' target='_blank'>configuración del inicio de sesión mediante GitHub para Discourse</a>."
     github_client_id: "ID del cliente para la autenticación mediante Github, registrado en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Clave secreta del cliente para la autenticación mediante Github, registrado en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    enable_discord_logins: '¿Permitir a los usuarios la autenticación mediante Discord?'
+    enable_discord_logins: "¿Permitir a los usuarios la autenticación mediante Discord?"
     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_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"
@@ -1663,6 +1675,9 @@ es:
     private_email: "No incluir contenido de publicaciones o temas en el título o el cuerpo del correo electrónico. NOTA: también desactiva los boletines por correo electrónico."
     email_total_attachment_size_limit_kb: "Tamaño máximo total de archivos adjuntos a correos electrónicos salientes. Establece el valor en 0 para desactivar el envío de archivos adjuntos."
     post_excerpts_in_emails: "En los correos electrónicos de notificación, siempre incluye extractos en lugar de publicaciones enteras."
+    raw_email_max_length: "Cuántos caracteres deben almacenarse para el correo electrónico entrante."
+    raw_rejected_email_max_length: "Cuántos caracteres deben almacenarse para el correo electrónico entrante rechazado."
+    delete_rejected_email_after_days: "Eliminar correos rechazados anteriores a (n) días."
     manual_polling_enabled: "Lanza correos electrónicos usando la API para las respuestas por correo electrónico."
     pop3_polling_enabled: "Poll vía POP3 para respuestas por correo electrónico."
     pop3_polling_ssl: "Usar SSL mientras se conecta al servidor POP3. (Recomendado)"
@@ -1721,6 +1736,7 @@ 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."
+    user_selected_primary_groups: "Permitir a los usuarios establecer su propio grupo primario"
     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."
@@ -1750,7 +1766,7 @@ es:
     enable_names: "Mostrar el nombre completo del usuario en su perfil, tarjeta de usuario y correos electrónicos. Desactiva esta opción para ocultar el nombre completo en todas partes."
     display_name_on_posts: "Mostrar el nombre completo de un usuario en sus publicaciones, además de su @usuario."
     show_time_gap_days: "Si entre dos publicaciones han pasado este número de días, mostrar el lapso de tiempo en el tema."
-    short_progress_text_threshold: "Después de que el número de publicaciones en un tema alcance esta cifra, la barra de progreso solo mostrará el número de publicaciones actual. Si cambias el ancho de la barra de progreso, deberías revisar este valor."
+    short_progress_text_threshold: "Después de que el número de publicaciones en un tema alcance esta cifra, la barra de progreso solo mostrará el número de publicaciones actual. Si cambias la anchura de la barra de progreso, deberías revisar este valor."
     default_code_lang: "Lenguaje de programación por defecto para aplicar el resaltado de la sintaxis en los bloques de código de GitHub (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "Cuando alguien publica en un tema cuya última respuesta fue hace más tiempo que este número de días, se le mostrará un aviso para desalentar el hecho de revivir una antigua discusión. Establece el valor en 0 para deshabilitar."
     autohighlight_all_code: "Forzar el resaltado de código a los bloques de código preformateado cuando no se especifique el lenguaje del código."
@@ -1765,7 +1781,7 @@ es:
     embed_username_required: "Se requiere el nombre de usuario para la creación de temas."
     notify_about_flags_after: "Si hay reportes que no han sido revisados después de este número de horas, enviar un mensaje personal a los moderadores. Establece el valor en 0 para deshabilitar."
     show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
-    delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad.
+    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."
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» deshabilitará completamente el slug."
@@ -1810,6 +1826,10 @@ es:
     default_categories_tracking: "Lista de categorías que están seguidas por defecto"
     default_categories_muted: "Lista de categorías que están silenciadas por defecto."
     default_categories_watching_first_post: "Lista de categorías en las que el primer mensaje de cada tema nuevo se vigilará por defecto."
+    default_tags_watching: "Lista de etiquetas vigiladas por defecto."
+    default_tags_tracking: "Lista de etiquetas seguidas por defecto."
+    default_tags_muted: "Lista de etiquetas silenciadas por defecto."
+    default_tags_watching_first_post: "Lista de etiquetas cuya primera publicación de cada tema nuevo estará vigilada por defecto."
     default_text_size: "Tamaño de texto seleccionado por defecto"
     default_title_count_mode: "Modo por defecto para el contador del título"
     retain_web_hook_events_period_days: "Número de días para retener registros de eventos de web hook."
@@ -1841,7 +1861,7 @@ es:
     city_for_disputes: "Ciudad de disputas"
     shared_drafts_category: "Habilite la característica de borradores compartidos designando una categoría para borradores de temas. Los temas de esta categoría se eliminarán de las listas de temas para los miembros del staff."
     push_notifications_prompt: "Mostrar aviso del consentimiento del usuario."
-    push_notifications_icon: "El icono de la insignia que aparece en la esquina de notificación. El tamaño requerido es de 96 × 96."
+    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."
     errors:
@@ -1902,6 +1922,8 @@ es:
       topic: "Resultados"
       user: "Usuarios"
     results_page: "Resultados de búsqueda para «%{term}»"
+    audio: "[audio]"
+    video: "[video]"
   sso:
     login_error: "Error al iniciar sesión"
     not_found: "No se pudo encontrar tu cuenta. Por favor, contacta al administrador del sitio."
@@ -2178,10 +2200,6 @@ es:
   admin_confirmation_mailer:
     title: "Confirmación de administrador"
     subject_template: "[%{email_prefix}] Confirma nueva cuenta de administrador"
-    text_body_template: |
-      Por favor, confirma que quieres agregar a **%{target_username}** como administrador de tu foro.
-
-      [Confirmar cuenta de administrador](%{admin_confirm_url})
   test_mailer:
     title: "Correo electrónico de prueba"
     subject_template: "[%{email_prefix}] Prueba de envío de correo electrónico"
@@ -2364,6 +2382,15 @@ es:
         Hola. Hemos visto que has estado leyendo, lo cual nos parece fantástico, ¡por lo que te hemos subido tu [nivel de confianza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
 
         Nos alegramos de ver que estés pasando tiempo con nosotros, y nos gustaría saber más sobre ti. Cuando puedas, [rellena tu perfil](%{base_url}/my/preferences/profile) o [crea un nuevo tema](%{base_url}/categories).
+    welcome_moderator:
+      title: "Bienvenido Moderador"
+      subject_template: "¡Felicidades, ahora eres un moderador!"
+      text_body_template: |
+        Has sido promovido con el status de moderador por un miembro del staff.
+
+        Como moderador, ahora tienes acceso a la <a href='%{base_url}/admin' target='_blank'>interfaz de administración</a>.
+
+        Con un gran poder viene una gran responsabilidad. Si eres nuevo en tareas de moderación, por favor sigue la [Guía de Moderación](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Bienvenida al invitado"
       subject_template: "¡Bienvenido a %{site_name}!"
@@ -2638,7 +2665,7 @@ es:
 
         Tu cuenta no tiene los permisos para responder al tema. Si crees que esto es un error, [contacta a un miembro del staff](%{base_url}/about).
     email_error_notification:
-      title: "Email. Error de notificación"
+      title: "Error de notificación de correo electrónico"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Error de autenticación POP"
       text_body_template: |
         Hubo un error de autenticación mientras se ejecutaba el polling de los correos electrónicos desde el servidor POP.
@@ -2647,7 +2674,7 @@ es:
 
         Si dispones de una interfaz de usuario web para la cuenta de correo POP, es posible que debas iniciar sesión allí y comprobar tu configuración.
     email_revoked:
-      title: "Email revocado"
+      title: "Correo electrónico revocado"
       subject_template: "¿Tu correo electrónico es correcto?"
       text_body_template: |
         Lo sentimos, estamos teniendo problemas para contactarte por correo electrónico. Nuestros últimos mensajes se han devuelto como imposibles de entregar.
@@ -2764,7 +2791,7 @@ es:
       text_body_template: |
         ¡Felicitaciones! Ganaste el **premio de usuario nuevo del mes de%{month_year}**. :trophy:
 
-        Este premio solo lo ganan dos de los nuevos miembros de cada mes y será visible permanentemente en [la página de insignias](%{url}).
+        Este premio solo lo ganan dos de los nuevos miembros de cada mes y será visible permanentemente en [la página de medallas](%{url}).
 
         Te has convertido rápidamente en un miembro de gran valor para nuestra comunidad. Gracias por unirte ¡y continúa con el gran trabajo!
     queued_posts_reminder:
@@ -2786,7 +2813,7 @@ es:
     Para cancelar estos correos, [haz clic aquí](%{unsubscribe_url}).
   subject_re: "Re:"
   subject_pm: "[MP]"
-  email_from: "%{user_name} via %{site_name}"
+  email_from: "%{user_name} vía %{site_name}"
   user_notifications:
     previous_discussion: "Respuestas anteriores"
     reached_limit:
@@ -2797,7 +2824,7 @@ es:
       title: "Darse de baja"
       description: "¿No estás interesado en recibir estos correos? ¡No hay problema! Haz clic abajo para darte de baja de inmediatamente:"
     reply_by_email: "[Visita el tema](%{base_url}%{url}) o responde a este correo para publicar."
-    reply_by_email_pm: "[Visitar Mensaje](%{base_url}%{url}) o responde a este correo para contestar a %{participants}."
+    reply_by_email_pm: "[Visita el mensaje](%{base_url}%{url}) o responde a este correo electrónico para contestar a %{participants}."
     only_reply_by_email: "Responde a este correo electrónico para comentar."
     only_reply_by_email_pm: "Responde a este correo electrónico para contestar a %{participants}."
     visit_link_to_respond: "[Visita el tema](%{base_url}%{url}) para responder."
@@ -2805,35 +2832,47 @@ es:
     posted_by: "Publicado por %{username} el %{post_date}"
     pm_participants: "Participantes: %{participants}"
     invited_group_to_private_message_body: |
-      %{username} te invitó en @%{group_name} al mensaje
+      %{username} invitó a @%{group_name} a un mensaje
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
       en
 
       > %{site_title} -- %{site_description}
+
+      Para unirte al mensaje, haz clic en el siguiente enlace:
+
+      %{topic_url}
     invited_to_private_message_body: |
       %{username} te invitó a un mensaje
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
       en
 
-      > %{site_title} -- %{site_description}
+      > %{site_title}  -- %{site_description}
+
+      Para unirte al mensaje, haz clic en el siguiente enlace:
+
+      %{topic_url}
     invited_to_topic_body: |
       %{username} te invitó a una discusión
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
       en
 
       > %{site_title} -- %{site_description}
+
+      Para unirte a la discusión, haz clic en el siguiente enlace:
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "Usuario invitado a MP grupal"
       subject_template: "[%{email_prefix}] %{username} invitó a @%{group_name} al mensaje «%{topic_title}»"
@@ -3032,10 +3071,10 @@ es:
       unread_notifications: "Notificaciones no leídas"
       liked_received: "Me gusta recibidos"
       new_users: "Usuarios nuevos"
-      popular_topics: "Temas populares"
+      popular_topics: "Temas destacados"
       follow_topic: "Seguir este tema"
       join_the_discussion: "Leer más"
-      popular_posts: "Temas populares"
+      popular_posts: "Temas destacados"
       more_new: "Nuevo para ti"
       subject_template: "[%{email_prefix}] Resumen"
       unsubscribe: "Este resumen se envía desde %{site_link} cuando no te hemos visto durante cierto tiempo. Cambia %{email_preferences_link} o %{unsubscribe_link} para cancelar tu suscripción."
@@ -3213,7 +3252,7 @@ es:
     missing: "Lo sentimos, no pudimos encontrar un avatar asociado a esa dirección de correo electrónico. ¿Puedes intentar subirlo de nuevo?"
   flag_reason:
     sockpuppet: "Un usuario nuevo creó un tema y otro usuario nuevo le ha respondido desde la misma dirección IP (%{ip_address}). Revisa la opción <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> en la configuración del sitio."
-    spam_hosts: "Este usuario nuevo intentó crear varios temas con enlaces al mismo dominio. Revisa la opción <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> en la configuración del sitio."
+    spam_hosts: "Este usuario nuevo intentó crear múltiples publicaciones con enlaces al mismo dominio. Se deben revisar todas las publicaciones de este usuario que incluyen enlaces. Revisa la configuración del sitio <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user excedido"
     exceeded_bounces_limit: "bounce_score_threshold excedido"
@@ -3301,7 +3340,7 @@ es:
 
       Las conversaciones que tenemos son el ejemplo para los recién llegados. Ayúdanos a influir en el futuro de esta comunidad al decidir participar en discusiones que hagan de este foro un lugar interesante en el cual estar &mdash; y al evitar aquellas que hagan lo contrario.
 
-      Este foro ofrece herramientas que permiten a la comunidad identificar de forma colectiva las mejores (y peores) contribuciones: me gusta, marcadores, reportes, insignias, respuestas, ediciones y demás. Usa todo esto para mejorar tu experiencia y la de los demás.
+      Este foro ofrece herramientas que permiten a la comunidad identificar de forma colectiva las mejores (y peores) contribuciones: me gusta, marcadores, reportes, medallas, respuestas, ediciones y demás. Usa todo esto para mejorar tu experiencia y la de los demás.
 
       Intentemos dejar esto mejor de lo que lo encontramos.
 
@@ -3624,242 +3663,242 @@ es:
       name: Editor
       description: Primera edición de una publicación
       long_description: |
-        Esta insignia se concede la primera vez que editas una de tus publicaciones. Aunque no siempre podrás editar tus publicaciones, editar es una buena idea — te permite mejorar tus publicaciones, corregir pequeños errores o añadir algo que se te había pasado. ¡Edita para hacer mejores a tus publicaciones!
+        Esta medalla se concede la primera vez que editas una de tus publicaciones. Aunque no siempre podrás editar tus publicaciones, editar es una buena idea — te permite mejorar tus publicaciones, corregir pequeños errores o añadir algo que se te había pasado. ¡Edita para hacer mejores a tus publicaciones!
     wiki_editor:
       name: Editor de wiki
       description: Primera edición de un tema wiki
       long_description: |
-        Esta insignia se concede la primera vez que editas un tema de tipo wiki.
+        Esta medalla se concede la primera vez que editas un tema de tipo wiki.
     basic_user:
       name: Básico
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Acceso</a> a todas las funciones esenciales de la comunidad"
       long_description: |
-        Esta insignia se concede cuando alcanzas el nivel de confianza 1. Gracias por quedarte y leer unos cuantos temas para aprender acerca de qué es esta comunidad. Las restricciones de usuario nuevo se han eliminado; podrás usar las funcionalidades esenciales como enviar mensajes privados a otras personas, reportar publicaciones, editar publicaciones wiki y publicar con múltiples imágenes y enlaces.
+        Esta medalla se concede cuando alcanzas el nivel de confianza 1. Gracias por quedarte y leer unos cuantos temas para aprender acerca de qué es esta comunidad. Las restricciones de usuario nuevo se han eliminado; podrás usar las funcionalidades esenciales como enviar mensajes privados a otras personas, reportar publicaciones, editar publicaciones wiki y publicar con múltiples imágenes y enlaces.
     member:
       name: Miembro
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Acceso</a> a invitaciones, mensajes grupales y más me gusta"
       long_description: |
-        Esta insignia se concede al llegar a nivel de confianza 2. Gracias por participar durante estas semanas y unirte de verdad a nuestra comunidad. Ahora puedes enviar invitaciones desde tu página de usuario o desde los temas, crear mensajes personales grupales y dar más me gusta por día.
+        Esta medalla se concede al llegar a nivel de confianza 2. Gracias por participar durante estas semanas y unirte de verdad a nuestra comunidad. Ahora puedes enviar invitaciones desde tu página de usuario o desde los temas, crear mensajes personales grupales y dar más me gusta por día.
     regular:
       name: Habitual
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Acceso</a> a las funciones: recategorizar, renombrar, publicar enlaces sin el tag no-follow y dar más me gusta"
       long_description: |
-        Esta insignia se concede al llegar a nivel de confianza 3. Gracias por ser una parte constante de nuestra comunidad durante estos meses. Ahora eres uno de nuestros lectores más activos y una fuente de confianza que hace nuestra comunidad mejor. Ahora puedes recategorizar y renombrar temas, tus reportes tienen más peso y tienes acceso a una categoría especial privada, además de poder dar muchos más me gusta al día.
+        Esta medalla se concede al llegar a nivel de confianza 3. Gracias por ser una parte constante de nuestra comunidad durante estos meses. Ahora eres uno de nuestros lectores más activos y una fuente de confianza que hace nuestra comunidad mejor. Ahora puedes recategorizar y renombrar temas, tus reportes tienen más peso y tienes acceso a una categoría especial privada, además de poder dar muchos más me gusta al día.
     leader:
       name: Líder
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Acceso</a> a las funciones: editar, destacar, cerrar, archivar, dividir y combinar temas globalmente"
       long_description: |
-        Esta insignia se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todas las publicaciones y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o fusionarlos.
+        Esta medalla se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todas las publicaciones y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o fusionarlos.
     welcome:
       name: ¡Bienvenido/a!
       description: Recibió un me gusta
       long_description: |
-        Esta insignia se concede al recibir tu primer me gusta en una publicación. ¡Felicitaciones! Publicaste algo que los demás miembros de la comunidad han considerado útil, interesante o entretenido
+        Esta medalla se concede al recibir tu primer me gusta en una publicación. ¡Felicitaciones! Publicaste algo que los demás miembros de la comunidad han considerado útil, interesante o entretenido.
     autobiographer:
       name: Autobiógrafo
       description: "Detalló información en su <a href=\"%{base_uri}/my/preferences/profile\">perfil</a> de usuario"
       long_description: |
-        Esta insignia se concede por rellenar <a href="%{base_uri}/my/preferences/profile">tu perfil de usuario</a> y seleccionar una foto de perfil. Al contar más sobre ti y lo que te interesa, la comunidad es más cercana y está más conectada. ¡Anímate!
+        Esta medalla se concede por rellenar <a href="%{base_uri}/my/preferences/profile">tu perfil de usuario</a> y seleccionar una foto de perfil. Al contar más sobre ti y lo que te interesa, la comunidad es más cercana y está más conectada. ¡Anímate!
     anniversary:
       name: Aniversario
       description: Miembro activo desde hace un año y que ha publicado al menos una vez
       long_description: |
-        Esta insignia se concede cuando has sido miembro durante un año y has publicado al menos una vez durante este tiempo. Gracias por seguir con nosotros y contribuir con nuestra comunidad. ¡No sería lo mismo sin ti!
+        Esta medalla se concede cuando has sido miembro durante un año y has publicado al menos una vez durante este tiempo. Gracias por seguir con nosotros y contribuir con nuestra comunidad. ¡No sería lo mismo sin ti!
     nice_post:
       name: Buena respuesta
       description: Recibió 10 me gusta en una respuesta
-      long_description: "Esta insignia se concede cuando una de tus respuestas consigue 10 me gusta. Tus respuestas han gustado a la comunidad y han ayudado a mantener viva la conversación. \n"
+      long_description: "Esta medalla se concede cuando una de tus respuestas consigue 10 me gusta. Tus respuestas han gustado a la comunidad y han ayudado a mantener viva la conversación. \n"
     good_post:
       name: Muy buena respuesta
       description: Recibió 25 me gusta en una respuesta
       long_description: |
-        Esta insignia se concede cuando una de tus respuestas consigue 25 me gusta. Tu respuesta ha sido excepcional y ha conseguido hacer la conversación mucho más interesante.
+        Esta medalla se concede cuando una de tus respuestas consigue 25 me gusta. Tu respuesta ha sido excepcional y ha conseguido hacer la conversación mucho más interesante.
     great_post:
       name: Excelente respuesta
       description: Recibió 50 me gusta en una respuesta
       long_description: |
-        Esta insignia se concede cuando una de tus respuestas consigue 50 me gusta. ¡Wow! ¡Tu respuesta ha sido fascinante, inspiradora muy graciosa o muy bien pensada y le ha encantado a la comunidad!
+        Esta medalla se concede cuando una de tus respuestas consigue 50 me gusta. ¡Wow! ¡Tu respuesta ha sido fascinante, inspiradora muy graciosa o muy bien pensada y le ha encantado a la comunidad!
     nice_topic:
       name: Buen tema
       description: Recibió 10 me gusta en un tema
       long_description: |
-        Esta insignia se concede cuando un tema tuyo recibe 10 me gusta. Iniciaste una conversación interesante que le ha gustado a la comunidad.
+        Esta medalla se concede cuando un tema tuyo recibe 10 me gusta. Iniciaste una conversación interesante que le ha gustado a la comunidad.
     good_topic:
       name: Muy buen tema
       description: Recibió 25 me gusta en un tema
       long_description: |
-        Esta insignia se concede cuando un tema tuyo consigue 25 me gusta. Iniciaste una conversación que la comunidad ha disfrutado mucho.
+        Esta medalla se concede cuando un tema tuyo consigue 25 me gusta. Iniciaste una conversación que la comunidad ha disfrutado mucho.
     great_topic:
       name: Excelente tema
       description: Recibió 50 me gusta en un tema
       long_description: |
-        Esta insignia se concede cuando un tema tuyo consigue 50 me gusta. ¡Comenzaste un tema fascinante cuya discusión le ha encantado a la comunidad!
+        Esta medalla se concede cuando un tema tuyo consigue 50 me gusta. ¡Comenzaste un tema fascinante cuya discusión le ha encantado a la comunidad!
     nice_share:
       name: Buena contribución
       description: Compartió una publicación con 25 visitantes únicos
       long_description: |
-        Esta insignia se concede por compartir un enlace que fue visitado por 25 visitantes externos. Gracias por difundir las palabras sobre nuestras discusiones y esta comunidad.
+        Esta medalla se concede por compartir un enlace que fue visitado por 25 visitantes externos. Gracias por difundir las palabras sobre nuestras discusiones y esta comunidad.
     good_share:
       name: Muy buena contribución
       description: Compartió una publicación con 300 visitantes únicos
       long_description: |
-        Esta insignia se concede cuando compartes un enlace y 300 visitantes externos hacen clic. ¡Buen trabajo! Has enseñado una conversación excelente a unas cuantas personas nuevas y has ayudado a crecer la comunidad.
+        Esta medalla se concede cuando compartes un enlace y 300 visitantes externos hacen clic. ¡Buen trabajo! Has enseñado una conversación excelente a unas cuantas personas nuevas y has ayudado a crecer la comunidad.
     great_share:
       name: Excelente contribución
       description: Compartió una publicación con 1000 visitantes únicos
       long_description: |
-        Esta insignia se concede cuando compartes un enlace y 1000 visitantes externos hacen clic en él. ¡Increíble! Has promocionado una conversación muy interesante a una gran audiencia y has ayudado a crecer la comunidad.
+        Esta medalla se concede cuando compartes un enlace y 1000 visitantes externos hacen clic en él. ¡Increíble! Has promocionado una conversación muy interesante a una gran audiencia y has ayudado a crecer la comunidad.
     first_like:
       name: Primer me gusta
       description: Le dio a me gusta a una publicación
       long_description: |
-        Esta insignia se otorga la primera vez que le das me gusta a una publicación usando el botón :heart:. Darle me gusta a publicaciones es una manera estupenda de hacer saber al resto de los miembros de la comunidad que lo que han publicado te ha parecido interesante, útil, entretenido o divertido. ¡Comparte el amor!
+        Esta medalla se otorga la primera vez que le das me gusta a una publicación usando el botón :heart:. Darle me gusta a publicaciones es una manera estupenda de hacer saber al resto de los miembros de la comunidad que lo que han publicado te ha parecido interesante, útil, entretenido o divertido. ¡Comparte el amor!
     first_flag:
       name: Primer reporte
       description: Reportó una publicación
       long_description: |
-        Esta insignia se concede la primera vez que reportas algo. Reportar es la manera en la que mantenemos el foro en buen estado. Si ves algo que deba ser revisado por un moderador por cualquier motivo, no dudes en reportarlo. Si ves un problema... ¡:flag_black: repórtalo!
+        Esta medalla se concede la primera vez que reportas algo. Reportar es la manera en la que mantenemos el foro en buen estado. Si ves algo que deba ser revisado por un moderador por cualquier motivo, no dudes en reportarlo. Si ves un problema... ¡:flag_black: repórtalo!
     promoter:
       name: Promotor
       description: Invitó a un usuario
       long_description: |
-        Esta insignia se concede cuando invitas a alguien a unirse a la comunidad a través del botón de invitación en tu página del perfil o al final de un tema. Invitar a amigos que puedan estar interesados en debates específicos es una excelente manera para integrar personas nuevas a la comunidad, ¡gracias!
+        Esta medalla se concede cuando invitas a alguien a unirse a la comunidad a través del botón de invitación en tu página del perfil o al final de un tema. Invitar a amigos que puedan estar interesados en debates específicos es una excelente manera para integrar personas nuevas a la comunidad, ¡gracias!
     campaigner:
       name: Activista
       description: Invitó a 3 usuarios
       long_description: |
-        Esta insignia se concede cuando has invitado a 3 personas que han pasado tiempo en el sitio y se han convertido en usuarios básicos. Una comunidad vibrante necesita de un flujo constante de nuevas voces que participen en las conversaciones.
+        Esta medalla se concede cuando has invitado a 3 personas que han pasado tiempo en el sitio y se han convertido en usuarios básicos. Una comunidad vibrante necesita de un flujo constante de nuevas voces que participen en las conversaciones.
     champion:
       name: Campeón
       description: Invitó a 5 miembros
       long_description: |
-        Esta insignia se concede cuando has invitado a 5 personas que han pasado el suficiente tiempo en el sitio como para convertirse en miembros de pleno derecho. ¡Bravo! ¡Gracias por enriquecer la diversidad de la comunidad con nuevos miembros!
+        Esta medalla se concede cuando has invitado a 5 personas que han pasado el suficiente tiempo en el sitio como para convertirse en miembros de pleno derecho. ¡Bravo! ¡Gracias por enriquecer la diversidad de la comunidad con nuevos miembros!
     first_share:
       name: Primera vez que comparte
       description: Compartió una publicación
       long_description: |
-        Esta insignia se otorga la primera vez que compartes un enlace a una respuesta o tema usando el botón de compartir. Compartir enlaces es una excelente manera de mostrar discusiones interesantes con el resto del mundo y hacer crecer la comunidad.
+        Esta medalla se otorga la primera vez que compartes un enlace a una respuesta o tema usando el botón de compartir. Compartir enlaces es una excelente manera de mostrar discusiones interesantes con el resto del mundo y hacer crecer la comunidad.
     first_link:
       name: Primer enlace
       description: Añadió un enlace a otro tema
       long_description: |
-        Esta insignia se otorga la primera vez que incluyes un enlace a otro tema. Enlazar temas ayuda al resto de lectores a encontrar conversaciones interesantes. ¡Enlaza libremente!
+        Esta medalla se otorga la primera vez que incluyes un enlace a otro tema. Enlazar temas ayuda al resto de lectores a encontrar conversaciones interesantes. ¡Enlaza libremente!
     first_quote:
       name: Primera cita
       description: Citó una publicación
       long_description: |
-        Esta insignia se concede la primera vez que citas algo en una respuesta. Citar las partes relevantes de mensajes anteriores ayuda a mantener la conversación conectada y sin salirse del tema. La manera más fácil de citar es seleccionando una parte de un mensaje y luego pulsar el botón de responder. ¡Cita abundantemente!
+        Esta medalla se concede la primera vez que citas algo en una respuesta. Citar las partes relevantes de mensajes anteriores ayuda a mantener la conversación conectada y sin salirse del tema. La manera más fácil de citar es seleccionando una parte de un mensaje y luego pulsar el botón de responder. ¡Cita abundantemente!
     read_guidelines:
       name: Preguntas frecuentes leídas
       description: "Leyó las <a href=\"%{base_uri}/guidelines\">directrices de la comunidad</a>"
       long_description: |
-        Esta insignia se concede por <a href="%{base_uri}/guidelines">leer las directrices de la comunidad</a>. Con seguir y compartir estas simples pautas, nos ayudarás a construir un foro más seguro, divertido y sostenible. Acuérdate de que detrás de cada usuario hay un ser humano muy parecido a ti. ¡Sé amable!
+        Esta medalla se concede por <a href="%{base_uri}/guidelines">leer las directrices de la comunidad</a>. Con seguir y compartir estas simples pautas, nos ayudarás a construir un foro más seguro, divertido y sostenible. Acuérdate de que detrás de cada usuario hay un ser humano muy parecido a ti. ¡Sé amable!
     reader:
       name: Lector
       description: Leyó todas las respuestas en un tema con más de 100 respuestas
       long_description: |
-        Esta insignia se concede la primera vez que lees un tema largo, uno con más de 100 respuestas. Leer una conversación con atención te ayuda a seguir el debate, entender los diferentes puntos de vista y llevar a conversaciones más interesantes. Cuanto más lees, mejor es la conversación. Como nos gusta decir: ¡la lectura es fundamental! :slight_smile:
+        Esta medalla se concede la primera vez que lees un tema largo, uno con más de 100 respuestas. Leer una conversación con atención te ayuda a seguir el debate, entender los diferentes puntos de vista y llevar a conversaciones más interesantes. Cuanto más lees, mejor es la conversación. Como nos gusta decir: ¡la lectura es fundamental! :slight_smile:
     popular_link:
       name: Enlace popular
       description: Publicó un enlace externo con al menos 50 clics
       long_description: |
-        Esta insignia se concede cuando el enlace que has compartido alcanza los 50 clics. ¡Gracias por publicar un enlace útil que añade un contexto interesante a la conversación!
+        Esta medalla se concede cuando el enlace que has compartido alcanza los 50 clics. ¡Gracias por publicar un enlace útil que añade un contexto interesante a la conversación!
     hot_link:
       name: Enlace muy popular
       description: Publicó un enlace externo con al menos 300 clics
       long_description: |
-        Esta insignia se concede cuando el enlace que has compartido alcanza los 300 clics. ¡Gracias por publicar un enlace que impulsó la conversación e ilustró el debate!
+        Esta medalla se concede cuando el enlace que has compartido alcanza los 300 clics. ¡Gracias por publicar un enlace que impulsó la conversación e ilustró el debate!
     famous_link:
       name: Enlace famoso
       description: Publicó un enlace externo con al menos 1000 clics
       long_description: |
-        Esta insignia se concede cuando un enlace que compartiste llega a 1000 clics. ¡Vaya! Publicaste un enlace que mejoró significativamente la conversación al añadir un detalle esencial, contextual e informativo. ¡Gran trabajo!
+        Esta medalla se concede cuando un enlace que compartiste llega a 1000 clics. ¡Vaya! Publicaste un enlace que mejoró significativamente la conversación al añadir un detalle esencial, contextual e informativo. ¡Gran trabajo!
     appreciated:
       name: Apreciado
       description: Recibió 1 me gusta en 20 publicaciones
       long_description: |
-        Esta insignia se concede cuando recibes al menos un me gusta en 20 publicaciones distintas. ¡La comunidad está disfrutando tus contribuciones a las conversaciones!
+        Esta medalla se concede cuando recibes al menos un me gusta en 20 publicaciones distintas. ¡La comunidad está disfrutando tus contribuciones a las conversaciones!
     respected:
       name: Respetado
       description: Recibió 2 me gusta en 100 publicaciones
       long_description: |
-        Esta insignia se concede cuando recibes al menos 2 me gusta en 100 publicaciones distintas. ¡La comunidad está apreciando tus numerosas aportaciones a las conversación!
+        Esta medalla se concede cuando recibes al menos 2 me gusta en 100 publicaciones distintas. ¡La comunidad está apreciando tus numerosas aportaciones a las conversación!
     admired:
       name: Admirado
       description: Recibió 5 me gusta en 300 publicaciones
       long_description: |
-        Esta insignia se concede cuando recibes al menos 5 me gusta en 300 publicaciones distintas. ¡Bravo! ¡La comunidad admira tus aportes frecuentes y de gran calidad!
+        Esta medalla se concede cuando recibes al menos 5 me gusta en 300 publicaciones distintas. ¡Bravo! ¡La comunidad admira tus aportes frecuentes y de gran calidad!
     out_of_love:
       name: Dadivoso
       description: Utilizó 50 me gusta en un día
       long_description: |
-        Esta insignia se concede cuando das los 50 me gusta que puedes utilizar al día. Recuerda tomar un momento y dar me gusta a las publicaciones que disfrutas, así incentivas a los demás miembros a crear aún mejores debates en el futuro.
+        Esta medalla se concede cuando das los 50 me gusta que puedes utilizar al día. Recuerda tomar un momento y dar me gusta a las publicaciones que disfrutas, así incentivas a los demás miembros a crear aún mejores debates en el futuro.
     higher_love:
       name: Generoso
       description: Utilizó 50 me gusta 5 veces
       long_description: |
-        Esta insignia se concede cuando das los 50 me gusta diarios 5 veces. ¡Gracias por tomarte tiempo en incentivar y premiar las mejores conversaciones cada día!
+        Esta medalla se concede cuando das los 50 me gusta diarios 5 veces. ¡Gracias por tomarte tiempo en incentivar y premiar las mejores conversaciones cada día!
     crazy_in_love:
       name: Magnánimo
       description: Utilizó 50 me gusta en un día 20 veces
       long_description: |
-        Esta insignia se concede cuando usas los 50 me gusta diarios 20 veces. ¡Genial! Eres un modelo a seguir por animar a los demás miembros de la comunidad.
+        Esta medalla se concede cuando usas los 50 me gusta diarios 20 veces. ¡Genial! Eres un modelo a seguir por animar a los demás miembros de la comunidad.
     thank_you:
       name: Agradecido/a
       description: Ha recibido me gusta en 20 publicaciones y dado 10 me gusta
       long_description: |
-        Esta insignia se concede cuando has recibido 20 me gusta en tus publicaciones y has dado 10 o más de vuelta. Cuando a alguien le gustan tus publicaciones, también encuentras el tiempo para agradecer las publicaciones de otras personas.
+        Esta medalla se concede cuando has recibido 20 me gusta en tus publicaciones y has dado 10 o más de vuelta. Cuando a alguien le gustan tus publicaciones, también encuentras el tiempo para agradecer las publicaciones de otras personas.
     gives_back:
       name: Cómplice
       description: Ha recibido me gusta en 100 publicaciones y dado 100 me gusta
       long_description: |
-        Esta insignia se concede cuando has recibido 100 me gusta en tus publicaciones y has dado 100 o más de vuelta. ¡Gracias por dar tanto y agradecer de vuelta!
+        Esta medalla se concede cuando has recibido 100 me gusta en tus publicaciones y has dado 100 o más de vuelta. ¡Gracias por dar tanto y agradecer de vuelta!
     empathetic:
       name: Empático
       description: Ha recibido me gusta en 500 publicaciones y dado 1000 me gusta
       long_description: |
-        Esta insignia se concede cuando has recibido 500 me gusta y le has dado me gusta a otros 1000 mensajes. Eres un modelo de generosidad y apreciación mutua. :two_hearts:.
+        Esta medalla se concede cuando has recibido 500 me gusta y le has dado me gusta a otros 1000 mensajes. Eres un modelo de generosidad y apreciación mutua :two_hearts:.
     first_emoji:
       name: Primer emoji
       description: Utilizó un emoji en una publicación
       long_description: |
-        Esta insignia se concede la primera vez que añades un emoji a tu publicación :thumbsup:. Los emoji te permiten añadir emociones a tu publicación, desde felicidad :smiley: a tristeza :anguished: pasando por enfado :angry: o cualquier otra expresión :sunglasses:. Comienza escribiendo : (dos puntos) o haz clic en el botón emoji de la barra del editor para seleccionar entre cientos de opciones. :ok_hand:
+        Esta medalla se concede la primera vez que añades un emoji a tu publicación :thumbsup:. Los emoji te permiten añadir emociones a tu publicación, desde felicidad :smiley: a tristeza :anguished: pasando por enfado :angry: o cualquier otra expresión :sunglasses:. Comienza escribiendo : (dos puntos) o haz clic en el botón emoji de la barra del editor para seleccionar entre cientos de opciones. :ok_hand:
     first_mention:
       name: Primera mención
       description: Mencionó a un usuario en una publicación
       long_description: |
-        Esta insignia se concede la primera vez que mencionas a un @usuario en una publicación. Las menciones generan notificaciones a la persona mencionada para que sepan que les estás mencionando. Simplemente empieza escribiendo @ (arroba) para mencionar a alguien o, si está permitido, a un grupo – es una forma conveniente de captar la atención de alguien.
+        Esta medalla se concede la primera vez que mencionas a un @usuario en una publicación. Las menciones generan notificaciones a la persona mencionada para que sepan que les estás mencionando. Simplemente empieza escribiendo @ (arroba) para mencionar a alguien o, si está permitido, a un grupo – es una forma conveniente de captar la atención de alguien.
     first_onebox:
       name: Primer onebox
       description: Publicó un enlace expandido vía onebox
       long_description: |
-        Esta insignia se concede la primera vez que publicas un enlace solo en una línea, que se expande automáticamente en un onebox con un resumen, título y (cuando esté disponible) imagen.
+        Esta medalla se concede la primera vez que publicas un enlace solo en una línea, que se expande automáticamente en un onebox con un resumen, título y (cuando esté disponible) imagen.
     first_reply_by_email:
       name: Primera respuesta por correo electrónico
       description: Respondió a una publicación por correo electrónico
       long_description: |
-        Esta insignia se concede la primera vez que respondes a una publicación por correo electrónico :e-mail:.
+        Esta medalla se concede la primera vez que respondes a una publicación por correo electrónico :e-mail:.
     new_user_of_the_month:
       name: "Usuario nuevo del mes"
       description: Contribuciones excepcionales en su primer mes
       long_description: |
-        Esta insignia se otorga para felicitar a dos nuevos usuarios cada mes por sus excelentes colaboraciones de acuerdo a la frecuencia con las que sus publicaciones reciben me gusta y quiénes se lo dan.
+        Esta medalla se otorga para felicitar a dos nuevos usuarios cada mes por sus excelentes colaboraciones de acuerdo a la frecuencia con las que sus publicaciones reciben me gusta y quiénes se lo dan.
     enthusiast:
       name: Entusiasta
       description: Visitó el sitio 10 días consecutivos
       long_description: |
-        Esta insignia se concede por visitarnos durante 10 días consecutivos. ¡Gracias por quedarte con nosotros más de una semana!
+        Esta medalla se concede por visitarnos durante 10 días consecutivos. ¡Gracias por quedarte con nosotros más de una semana!
     aficionado:
       name: Aficionado
       description: Visitó 100 días consecutivos
       long_description: |
-        Esta insignia se concede por visitarnos durante 100 días consecutivos. ¡Eso es más de tres meses!
+        Esta medalla se concede por visitarnos durante 100 días consecutivos. ¡Eso es más de tres meses!
     devotee:
       name: Devoto
       description: Visitó 365 días consecutivos
       long_description: |
-        Esta insignia se concede por visitarnos durante 365 días consecutivos. ¡Wow, un año entero!
-    badge_title_metadata: "insignia %{display_name} en %{site_title}"
+        Esta medalla se concede por visitarnos durante 365 días consecutivos. ¡Wow, un año entero!
+    badge_title_metadata: "%{display_name} medalla en %{site_title}"
   admin_login:
     success: "Correo electrónico enviado"
     errors:
@@ -3886,6 +3925,9 @@ es:
       restricted_to:
         one: '"%{tag_name}" está restringida a la categoría "%{category_names}"'
         other: '«%{tag_name}» está restringida a las siguientes categorías: %{category_names}'
+    required_tags_from_group:
+      one: "Debes incluir al menos %{count} etiqueta %{tag_group_name}."
+      other: "Debes incluir al menos %{count} etiquetas %{tag_group_name}."
   rss_by_tag: "Temas con la etiqueta %{tag}"
   finish_installation:
     congratulations: "¡Felicitaciones, has instalado Discourse!"
@@ -4163,4 +4205,4 @@ es:
   email_style:
     html_missing_placeholder: "La plantilla html debe incluir %{placeholder}"
   discord:
-    not_in_allowed_guild: 'La autenticación falló. No eres miembro de ningún clan de Discord permitido.'
+    not_in_allowed_guild: "La autenticación falló. No eres miembro de ningún clan de Discord permitido."
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 8f45ce7b49..4a1b073d68 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -45,7 +45,6 @@ et:
         auto_generated_email_error: "Juhtub, kui 'precedence' päis on seatud väärtusele: list, junk, bulk või auto_reply või kui mingi muu päis sisaldab väärtusi: auto-submitted, auto-replied või auto-generated."
         no_body_detected_error: "Juhtub, kui meil ei õnnestunud keha eraldada ja manused puudusid."
         inactive_user_error: "Juhtub, kui saatja ei ole aktiveeritud."
-        bad_destination_address: "Juhtub, kui ükski To/Cc/Bcc meiliaadresidest ei lange kokku seadistatud sissetulavate meiliaadressidega."
         strangers_not_allowed_error: "Juhtub, kui kasutaja proovib teha teemat liiki, millesse ta ise ei kuulu."
         insufficient_trust_level_error: "Juhtub, kui kasutaja proovib teha teemat liiki, millele tal puudub vajalik usaldustase."
         reply_user_not_matching_error: "Juhtub, kui vastus tuleb teistsuguselt meiliaadressilt kui see, millele märguanne saadeti."
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 712f34bd51..4179077907 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -58,7 +58,6 @@ fa_IR:
         auto_generated_email_error: "زمانی که 'اولویت' سربرگ به: فهرست، شکسته، انبوه یا پاسخ خودکار اتفاق می‌افتد. یا وقتی سربرگ دیگری شامل: ثبت خودکار، پاسخ خودکار یا ایجاد خودکار باشد."
         no_body_detected_error: "وقتی که نمی‌توانیم متن را استخراج کنیم و ضمیمه‌ای وجود ندارد اتفاق می‌افتد."
         inactive_user_error: "هنگامی که ارسال کننده فعال نباشد."
-        bad_destination_address: "وقتی ایمیل‌‌های To/Cc/Bcc با یکی از ایمیل‌های پیکربندی شده ورودی هماهنگ نیستند، اتفاق می‌افتد"
         strangers_not_allowed_error: "هنگامی که که کاربر سعی در ایجاد موضوع در دسته‌بندی می کند که در آن عضو نیست، رخ می‌دهد."
         insufficient_trust_level_error: "وقتی اتفاق می‌افتد که کاربر قصد ایجاد موضوع در دسته‌بندی را دارد که سطح اعتمادش با آن دسته‌بندی هماهنگ نیست."
         reply_user_not_matching_error: "وقتی رخ می‌دهد که پاسخ از ایمیل متفاوتی از آنچه که ما اطلاع‌سانی را به آن ارسال کرده ایم، دریافت شده باشد."
@@ -503,7 +502,6 @@ fa_IR:
     activated: "با عرض پوزش، این حساب کاربری در حال حاضر فعال شده است."
     admin_confirm:
       title: "تایید حساب کاربری مدیریت"
-      description: "آیا از انتخاب <b>%{target_username}</b> به عنوان مدیریت اطمینان دارید؟"
       grant: "اعطای دسترسی مدیریت"
       complete: "<b>%{target_username}</b> یک مدیر ارشد است."
       back_to: "بازگشت به %{title}"
@@ -1178,7 +1176,7 @@ fa_IR:
     embed_post_limit: "حداکثر تعداد نوشته‌هایی که می‌توانید جا‌سازی کنید. "
     embed_username_required: "نام‌کاربری برای ایجاد تاپیک مورد نیاز است."
     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: "جلوگیری از دانلود کردن فایل پیوست توسط افراد ناشناس. اخطار: این گزینه از هر سایت بدون عکسی جلوگیری می کند. "
     slug_generation_method: "یک روش ایجاد نام یکتا انتخاب کنید. 'encoded' رشته‌ای شامل درصد ایجاد می‌کند. 'none' اسم یکتا را به صورت کلی غیر‌فعال می‌نماید."
@@ -1433,10 +1431,6 @@ fa_IR:
   admin_confirmation_mailer:
     title: "تایید مدیریت"
     subject_template: "[%{email_prefix}] تایید حساب کاربری مدیر جدید"
-    text_body_template: |
-      لطفا تایید کنید که می‌خواهید **%{target_username}** را به عنوان مدیر اضافه کنید.
-
-      [تایید حساب کاربری مدیریت](%{admin_confirm_url})
   test_mailer:
     title: "تست نامه‌رسان"
     subject_template: "[%{email_prefix}] تست تحویل ایمیل"
@@ -1679,26 +1673,6 @@ fa_IR:
     only_reply_by_email: "برای پاسخدهی، به این ایمیل پاسخ دهید."
     visit_link_to_respond: "[موضوع را](%{base_url}%{url}) برای ارسال پاسخ ببینید."
     posted_by: "نوشته شده توسط {username}% در تاریخ {post_date}%"
-    invited_to_private_message_body: |
-      %{username} شما را به یک پیام دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      در
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} شما را به یک بحث دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      در
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "کاربر دعوت شده به پیام خصوصی"
       text_body_template: |
@@ -1988,7 +1962,6 @@ fa_IR:
     missing: "با عرض پوزش، نمی‌توانیم آواتار مرتبطی با این ایمیل پیدا کنیم. لطفا دوباره آپلود کنید."
   flag_reason:
     sockpuppet: "یک کاربر جدید موضوع جدیدی ایجاد کرده و کاربری با همان آیپی به موضوع پاسخ داده (%{ip_address}). قسمت <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> را از تنظیمات سایت ببینید."
-    spam_hosts: "این کاربر تلاش کرده چند نوشته با لینک به یک دامنه ارسال کند. قسمت <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> را از تنظیمات سایت ببینید."
   skipped_email_log:
     exceeded_emails_limit: "مقدار max_emails_per_day_per_user بیش از حد مجاز است"
     exceeded_bounces_limit: "مقدار bounce_score_threshold بیش از حد مجاز است"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 4304ef29bd..0dd7a503ef 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -49,6 +49,7 @@ fi:
       about_json_values: "about.json sisältää arvoja, jotka eivät kelpaa: %{errors}"
       git: "Virhe git-tietovarastoa kloonattaessa: ei ole pääsyoikeutta tai tietovarastoa ei löytynyt"
       unpack_failed: "Tiedoston purku epäonnistui"
+      file_too_big: "Purettu tiedosto on liian suuri."
       unknown_file_type: "Lähettämäsi tiedosto ei vaikuta olevan käypä Discourse-teema."
     errors:
       component_no_user_selectable: "Teemakomponentti ei voi olla käyttäjän valittavissa"
@@ -91,7 +92,6 @@ fi:
         from_reply_by_address_error: "Näin käy, kun lähettäjän osoite (From) on sama kuin vastausten sähköpostiosoite."
         inactive_user_error: "Näin käy, kun lähettäjä ei ole aktiivinen."
         silenced_user_error: "Näin käy, kun lähettäjä on hiljennetty."
-        bad_destination_address: "Näin käy, kun viestin vastaanottaja/kopio/piilokopio -kenttien osoitteet eivät täsmää asetettuihin saapuvan sähköpostin osoitteiden kanssa."
         strangers_not_allowed_error: "Näin käy, kun käyttäjä yrittää aloittaa ketjun alueella, jonka jäsen ei ole."
         insufficient_trust_level_error: "Näin käy, kun käyttäjä yrittää aloittaa ketjun alueella, jonka vähimmäisluottamustasovaatimusta ei täytä."
         reply_user_not_matching_error: "Näin käy, kun vastaus saapuu eri sähköpostiosoitteesta kuin mihin ilmoitus lähetettiin."
@@ -208,7 +208,11 @@ fi:
   email_template_cant_be_modified: "Tätä sähköpostipohjaa ei voi muokata"
   invalid_whisper_access: "Joko kuiskaukset eivät ole käytössä tai sinulla ei ole oikeutta kuiskata."
   not_in_group:
+    title_topic: "Täytyy kuulua ryhmään, jotta näkee tämän ketjun."
+    title_category: "Täytyy kuulua ryhmään, jotta näkee tämän alueen."
+    request_membership: "Hae jäsenyyttä"
     join_group: "Liity ryhmään"
+  deleted_topic: "Ups! Ketju on poistettu eikä ole enää saatavilla."
   reading_time: "Lukuaika"
   likes: "Tykkäykset"
   too_many_replies:
@@ -236,6 +240,10 @@ fi:
     replies:
       one: "%{count} vastaus"
       other: "%{count} vastausta"
+    likes:
+      one: "%{count} tykkäys"
+      other: "%{count} tykkäystä"
+    last_reply: "Viimeisin vastaus"
     created: "Luotu"
   no_mentions_allowed: "Pahoittelut, et voi mainita muita käyttäjiä."
   too_many_mentions:
@@ -724,7 +732,6 @@ fi:
     activated: "Pahoittelut, tämä tili on jo aktivoitu."
     admin_confirm:
       title: "Vahvista ylläpitäjätili"
-      description: "Oletko varma, että haluat käyttäjästä <b>%{target_username}</b> ylläpitäjän?"
       grant: "Myönnä ylläpitäjäoikeudet"
       complete: "<b>%{target_username}</b> on nyt ylläpitäjä."
       back_to: "Palaa %{title}"
@@ -773,6 +780,9 @@ fi:
       description: "Tykkää viestistä"
       short_description: "Tykkää viestistä"
       long_form: "tykkäsi tästä"
+  draft_backup:
+    pm_title: "Varmuuskopiot ketjuihin suunnatuista luonnoksista"
+    pm_body: "Ketju johon varmuuskopiot luonnoksista sijoitetaan"
   user_activity:
     no_default:
       self: "Et ole vielä tehnyt mitään mainittavaa."
@@ -788,6 +798,10 @@ fi:
       others: "Ei vastauksia."
     no_drafts:
       self: "Sinulla ei ole luonnoksia. Aloita kirjoittamaan viestiä mihin tahansa ketjuun niin se tallentuu automaattiseksi uudeksi luonnokseksi."
+  webauthn:
+    validation:
+      invalid_type_error: "Annettu webauthn-tyyppi ei kelpaa. Kelvollisia ovat webauthn.get ja webauthn.create."
+      challenge_mismatch_error: "Palautettu haaste ei vastaa todennuspalvelimen luomaa haastetta."
   topic_flag_types:
     spam:
       title: "Roskaposti"
@@ -1679,7 +1693,7 @@ fi:
     embed_username_required: "Käyttäjänimi vaaditaan ketjun luomiseksi."
     notify_about_flags_after: "Jos lippuja on ollut käsittelemättä näin monen tunnin ajan, lähetä yksityisviesti valvojille. Poista käytöstä asettamalla 0."
     show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, kehota ylläpitäjiä aloittamaan ketjuja."
-    delete_drafts_older_than_n_days: Poista yli (n) päivää vanhat luonnokset.
+    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."
     slug_generation_method: "Valitse polkulyhenteen luomisen metodi. 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkulyhenteet käytöstä."
@@ -1873,6 +1887,12 @@ fi:
     autoclosed_disabled_lastpost: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     auto_deleted_by_timer: "Poistettiin ajastetusti."
   login:
+    security_key_description: "Kun fyysinen tunnistautumislaite on kätesi ulottuvilla, klikkaa alla olevaa \"Tunnistaudu tunnistautumislaitteella\" -painiketta."
+    security_key_alternative: "Et löydä tunnistautumislaitetta tai haluat käyttää muuta tapaa?"
+    security_key_authenticate: "Tunnistaudu tunnistautumislaitteen avulla"
+    security_key_not_allowed_error: "Tunnistaumislaitteella tunnistautumisprosessi joko vanheni tai peruutettiin."
+    security_key_no_matching_credential_error: "Tunnistautumislaitteelta ei löytynyt kelpaavia pääsytietoja."
+    security_key_support_missing_error: "Tämä laitteesi tai selaimesi ei tue tunnistaumislaitteita. Käytä muuta tapaa."
     not_approved: "Tiliäsi ei ole vielä hyväksytty. Saat ilmoituksen sähköpostilla, kun voit kirjautua sisään."
     incorrect_username_email_or_password: "Väärä käyttäjänimi, sähköposti tai salasana"
     incorrect_password: "Väärä salasana"
@@ -2039,10 +2059,6 @@ fi:
   admin_confirmation_mailer:
     title: "Ylläpitäjän vahvistaminen"
     subject_template: "[%{email_prefix}] Vahvista uusi ylläpitäjätili"
-    text_body_template: |
-      Vahvista, että haluat käyttäjästä **%{target_username}** ylläpitäjän palstallesi.
-
-      [Vahvista ylläpitäjäoikeudet](%{admin_confirm_url})
   test_mailer:
     title: "Sähköpostipalvelun testaus"
     subject_template: "[%{email_prefix}] Sähköpostin toimitettavuustesti"
@@ -2581,36 +2597,6 @@ fi:
     visit_link_to_respond_pm: "Vastaa käyttäjille %{participants} [vierailemalla keskustelussa](%{base_url}%{url})."
     posted_by: "Käyttäjältä %{username} %{post_date}"
     pm_participants: "Osanottajat: %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} kutsui ryhmän @%{group_name} yksityiskeskusteluun
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sivustolla
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} kutsui sinut yksityiskeskusteluun
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sivustolla
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} kustui sinut keskusteluun
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sivustolla
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Ryhmä kutsuttiin yksityiskeskusteluun"
       subject_template: "[%{email_prefix}] %{username} kutsui ryhmän %{group_name} yksityiskeskusteluun '%{topic_title}'"
@@ -2921,6 +2907,8 @@ fi:
         %{base_url}/u/activate-account/%{email_token}
 
         Jos linkkiä ei voi klikata, yritä kopioida ja liittää se selaimen osoiteriville.
+    activation_reminder:
+      title: "Aktivointimuistutus"
     suspicious_login:
       title: "Varoitus uudesta kirjautumisesta"
       subject_template: "[%{site_name}] Uusi kirjautuminen paikasta %{location}"
@@ -2975,7 +2963,6 @@ fi:
     missing: "Pahoittelut, emme löydä profiilikuvaa, joka olisi yhdistetty tähän sähköpostiosoitteeseen. Voitko yrittää ladata sen uudestaan?"
   flag_reason:
     sockpuppet: "Uusi käyttäjä aloitti ketjun, johon toinen uusi käyttäjä samasta IP-osoitteesta (%{ip_address}) vastasi. Katso asetus <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Tämä uusi käyttäjä yritti luoda useita viestejä, jotka sisälsivät linkkejä samaan verkkotunnukseen. Katso asetus <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user ylitettiin"
     exceeded_bounces_limit: "bounce_score_threshold ylitettiin"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 195ef25a12..5a4ec2164a 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -91,7 +91,6 @@ fr:
         from_reply_by_address_error: "Survient quand l'entête 'From' correspond à l'adresse courriel 'Reply by'."
         inactive_user_error: "Se produit quand l'expéditeur n'est pas actif."
         silenced_user_error: "Se produit lorsque l'expéditeur a été mis sous silence."
-        bad_destination_address: "Se produit quand aucune des adresses de courriel des champs To/Cc/Bcc ne correspondent à une adresse de courriel entrante configurée."
         strangers_not_allowed_error: "Se produit quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie dans laquelle il n'est pas membre."
         insufficient_trust_level_error: "Se produit quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie pour laquelle il n'a pas le niveau de confiance nécessaire."
         reply_user_not_matching_error: "Se produit quand une réponse est venue d'une adresse de courriel différente de celle où a été envoyée la notification."
@@ -729,7 +728,6 @@ fr:
     activated: "Désolé, ce compte a déjà été activé."
     admin_confirm:
       title: "Confirmer le compte administrateur"
-      description: "Êtes-vous sûr de vouloir <b>%{target_username}</b> comme administrateur ?"
       grant: "Accorder l'accès administrateur"
       complete: "<b>%{target_username}</b> est maintenant un administrateur."
       back_to: "Retourner à %{title}"
@@ -1266,7 +1264,6 @@ fr:
     editing_grace_period_max_diff_high_trust: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 2 et plus)."
     staff_edit_locks_post: "Les messages seront vérouillés à la modification si modifiés par des responsables"
     post_edit_time_limit: "Un auteur du niveau de confiance 0 ou 1 peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
-    tl2_post_edit_time_limit: "Un auteur du niveau de confiance 2 peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite. "
     edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand désactivé, seuls les responsables peuvent voir l'historique."
     delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Pour une valeur renseignée à 0, les messages seront supprimés immédiatement."
     max_image_width: "Largeur maximale des images dans un message"
@@ -1435,9 +1432,9 @@ fr:
     enable_github_logins: "Activer l'authentification GitHub, nécessite github_client_id et github_client_secret. Voir <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurer GitHub Login pour Discourse</a>."
     github_client_id: "Id client pour l'authentification Github, enregistré sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Secret client pour l'authentification Github, enregistré sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    enable_discord_logins: 'Permettre aux utilisateurs de s''authentifier via Discord ?'
+    enable_discord_logins: "Permettre aux utilisateurs de s'authentifier via Discord ?"
     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_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"
@@ -1747,7 +1744,7 @@ fr:
     embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
     notify_about_flags_after: "S'il y a des signalements qui n'ont pas été gérés après ce nombre d'heures, envoyer un message direct aux modérateurs. 0 pour désactiver."
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
-    delete_drafts_older_than_n_days: Supprimer les ébauches plus vieux que (n) jours.
+    delete_drafts_older_than_n_days: "Supprimer les ébauches plus vieux que (n) jours."
     bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode de démarrage (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants."
@@ -1969,6 +1966,12 @@ fr:
     autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Vous pouvez y participer."
     auto_deleted_by_timer: "Supprimé automatiquement par planification"
   login:
+    security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton S'authentifier avec une clé de sécurité ci-dessous."
+    security_key_alternative: "Vous ne trouvez pas votre clé de sécurité ou voulez utiliser une autre méthode ?"
+    security_key_authenticate: "S'authentifier avec une clé de sécurité"
+    security_key_not_allowed_error: "La procédure d'authentification de la clé de sécurité a expiré ou a été annulée."
+    security_key_no_matching_credential_error: "Aucun identifiant correspondant n'a pu être trouvé dans la clé de sécurité donnée."
+    security_key_support_missing_error: "Votre appareil ou navigateur actuel ne supporte pas l'utilisation de clés de sécurité. Veuillez utiliser une autre méthode."
     not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
     incorrect_username_email_or_password: "pseudo, adresse de courriel ou mot de passe incorrect"
     incorrect_password: "Mot de passe incorrect"
@@ -2161,10 +2164,6 @@ 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 aimeriez ajouter **%{target_username}** comme administrateur de votre forum.
-
-      [Confirm Administrator Account](%{admin_confirm_url})
   test_mailer:
     title: "Envoyer un courriel de test"
     subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
@@ -2742,42 +2741,6 @@ fr:
     visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre à %{participants}."
     posted_by: "Redigé par %{username} le %{post_date}"
     pm_participants: "Participants : %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} a invité @%{group_name} à un message
-
-      > **%{topic_title}**
-
-      >
-
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} vous a invité(e) à un message
-
-      > **%{topic_title}**
-
-      >
-
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-
-      >
-
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Utilisateur a invité groupe au MD"
       subject_template: "[%{email_prefix}] %{username} a invité @%{group_name} dans la conversation « %{topic_title} »"
@@ -3165,7 +3128,6 @@ fr:
     missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?"
   flag_reason:
     sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP (%{ip_address}) a répondu. Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine. Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user dépassé"
     exceeded_bounces_limit: "bounce_score_threshold dépassé"
@@ -4147,4 +4109,4 @@ fr:
   email_style:
     html_missing_placeholder: "Le modèle HTML doit inclure %{placeholder}"
   discord:
-    not_in_allowed_guild: 'L''authentification a échoué. Vous n''êtes membre d''aucune guilde Discord autorisée.'
+    not_in_allowed_guild: "L'authentification a échoué. Vous n'êtes membre d'aucune guilde Discord autorisée."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index ca4f8a82ff..2ff63575d9 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -92,7 +92,7 @@ he:
         from_reply_by_address_error: "מתרחש כאשר הכותרת ‚מאת’ תואמת לתגובה לפי כתובת דוא״ל."
         inactive_user_error: "מתרחש כאשר השולח אינו פעיל."
         silenced_user_error: "מתרחש כאשר השולח הושתק."
-        bad_destination_address: "מתרחש כאשר אף אחת מהכתובות בשדות אל, עותק או עותק מוסתר אינה תואמת לאף כתובת דוא״ל נכנסת מוגדרת."
+        bad_destination_address: "מתרחש כאשר אף אחת מהכתובות בשדות אל או עותק אינה תואמת לאף כתובת דוא״ל נכנסת מוגדרת."
         strangers_not_allowed_error: "מתרחש כאשר משתמשים מנסים ליצור נושא חדש בקטגוריה בה הם אינם חברים."
         insufficient_trust_level_error: "מתרחש כאשר משתמשים מנסים ליצור נושא חדש בקטגוריה בה אין להם את רמת האמון/הרשאה הנדרשת."
         reply_user_not_matching_error: "מתרחש כאשר תגובה מגיעה מכתובת דוא״ל שונה מזו שאליה נשלחה ההתראה."
@@ -171,6 +171,7 @@ he:
         many: "ציינת את הבחירות השגויות %{name}"
         other: "ציינת את הבחירות השגויות %{name}"
       default_categories_already_selected: "לא ניתן לבחור קטגוריה שנעשה בה שימוש ברשימה אחרת."
+      default_tags_already_selected: "לא ניתן לבחור תגית שנעשה בה שימוש ברשימה אחרת"
       s3_upload_bucket_is_required: "לא ניתן להפעיל העלאות ל־S3 ללא ‚s3_upload_bucket’."
       enable_s3_uploads_is_required: "אי אפשר להגדיר מאגר ל־S3 אלמלא הפעלת העלאות ל־S3."
       s3_backup_requires_s3_settings: "לא ניתן להשתמש ב־S3 כמיקום לגיבוי אלמלא סיפקת את ‚%{setting_name}’."
@@ -267,6 +268,7 @@ he:
       other: "%{count} לייקים"
     last_reply: "תגובה אחרונה"
     created: "נוצר"
+    new_topic: "יצירת נושא חדש"
   no_mentions_allowed: "אין לך אפשרות לאזכר משתמשים אחרים, עמך הסליחה."
   too_many_mentions:
     one: "מצטערים, ניתן לאזכר משתמש אחד בלבד בפוסט"
@@ -802,7 +804,7 @@ he:
     activated: "מצטערים, חשבון זה כבר הופעל."
     admin_confirm:
       title: "אישור חשבון ניהול"
-      description: "לצרף את <b>%{target_username}</b> לסגל הניהול?"
+      description: "להעניק למשתמש <b>%{target_username} (%{target_email})</b> הרשאות ניהול?"
       grant: "הענקת גישת ניהול"
       complete: "למשתמש <b>%{target_username}</b> יש כעת תפקיד ניהולי."
       back_to: "חזרה אל %{title}"
@@ -851,6 +853,13 @@ he:
       description: "תנו לייק לפוסט זה"
       short_description: "אהבו פוסט זה"
       long_form: "נתתי לזה לייק"
+  draft:
+    sequence_conflict_error:
+      title: "שגיאת טיוטה"
+      description: "הטיוטה נערכת בחלון אחר. נא לרענן את העמוד הזה."
+  draft_backup:
+    pm_title: "טיוטות גיבוי מנושאים שמתנהלים כרגע"
+    pm_body: "נושא שמכיל טיוטות גיבוי"
   user_activity:
     no_default:
       self: "עדיין אין לך פעילות."
@@ -868,18 +877,18 @@ he:
       self: "אין לך טיוטות, ניתן להתחיל לכתוב תגובה בכל נושא שהוא והוא יישמר אוטומטית כטיוטה חדשה."
   webauthn:
     validation:
-      invalid_type_error: 'סוג ה־webauthn שסופק שגוי. הסוגים התקינים הם webauthn.get ו־webauthn.create.'
-      challenge_mismatch_error: 'האתגר שסופק לא תואם לאתגר שנוצר על ידי שרת האימות.'
-      invalid_origin_error: 'מקור בקשת האימות לא תואמת למקור השרת.'
-      malformed_attestation_error: 'איך שגיאה בעת פענוח נתוני העדות.'
-      invalid_relying_party_id_error: 'ה־Relying Party ID של בקשת האימות לא תואמת ל־Relying Party ID של השרת.'
-      user_verification_error: 'נדרש אימות משתמש.'
-      unsupported_public_key_algorithm_error: 'אלגוריתם המפתח הציבורי שסופק לא נתמך על ידי השרת.'
-      unsupported_attestation_format_error: 'תצורת העדות לא נתמכת על ידי השרת.'
-      credential_id_in_use_error: 'מזהה פרטי הגישה כבר בשימוש.'
-      public_key_error: 'אימות המפתח הציבורי עבור פרטי הגישה נכשל.'
-      ownership_error: 'מפתח האבטחה אינו בבעלות המשתמש.'
-      not_found_error: 'לא ניתן למצוא מפתח אבטחה עם מזהה פרטי הגישה שסופק.'
+      invalid_type_error: "סוג ה־webauthn שסופק שגוי. הסוגים התקינים הם webauthn.get ו־webauthn.create."
+      challenge_mismatch_error: "האתגר שסופק לא תואם לאתגר שנוצר על ידי שרת האימות."
+      invalid_origin_error: "מקור בקשת האימות לא תואמת למקור השרת."
+      malformed_attestation_error: "איך שגיאה בעת פענוח נתוני העדות."
+      invalid_relying_party_id_error: "ה־Relying Party ID של בקשת האימות לא תואמת ל־Relying Party ID של השרת."
+      user_verification_error: "נדרש אימות משתמש."
+      unsupported_public_key_algorithm_error: "אלגוריתם המפתח הציבורי שסופק לא נתמך על ידי השרת."
+      unsupported_attestation_format_error: "תצורת העדות לא נתמכת על ידי השרת."
+      credential_id_in_use_error: "מזהה פרטי הגישה כבר בשימוש."
+      public_key_error: "אימות המפתח הציבורי עבור פרטי הגישה נכשל."
+      ownership_error: "מפתח האבטחה אינו בבעלות המשתמש."
+      not_found_error: "לא ניתן למצוא מפתח אבטחה עם מזהה פרטי הגישה שסופק."
   topic_flag_types:
     spam:
       title: "ספאם"
@@ -1355,7 +1364,7 @@ he:
     editing_grace_period_max_diff_high_trust: "מספר תווים מרבי שמותר לשנות בטווח עריכת חסד, אם נערכו למעלה מהכמות הזאת יש ליצור מהדורה חדשה לפוסט (דרגות אמון 2 ומעלה)"
     staff_edit_locks_post: "פוסטים יינעלו מפני עריכה אם נערכו על ידי הסגל."
     post_edit_time_limit: "יוצרי פוסטים בדרגת אמון 1 או 0 יכולים לערוך את הפוסטים שלהם עד (n) דקות לאחר הפרסום. 0 כדי לאפשר לערוך לעד.<br data-mce-bogus=\"1\">"
-    tl2_post_edit_time_limit: "יוצרי פוסטים בדרגת אמון 2 יכולים לערוך את הפוסטים שלהם עד (n) דקות לאחר הפרסום. 0 כדי לאפשר לערוך לעד."
+    tl2_post_edit_time_limit: "מחברים בדרגת אמון 2 ומעלה יכולים לערוך את הפוסטים שלהם (n) דקות לאחר פרסומם. 0 ישבית את ההגבלה הזאת."
     edit_history_visible_to_public: "אפשרו לכולם לראות גרסאות קודמות של פוסט ערוך. כאשר אפשרות זו מנוטרלת, רק חברי צוות יכולים לצפות בהן."
     delete_removed_posts_after: "פוסטים שהוסרו על ידי מחבריהם ימחקו באופן אוטומטי לאחר (n) שעות. אם הגדרה זו מכוונת ל-0, פוסטים ימחקו מיידית."
     max_image_width: "הרוחב המקסימלי של תצוגת תמונה מוקטנת בפוסט"
@@ -1525,9 +1534,9 @@ he:
     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: "מזהה לקוח לאימות מול 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>"
-    enable_discord_logins: 'לאפשר למשתמשים לעבור אימות דרך Discord?'
+    enable_discord_logins: "לאפשר למשתמשים לעבור אימות דרך Discord?"
     discord_client_id: 'מזהה לקוח Discord (אין לך כזה? יש לבקר ב<a href="https://discordapp.com/developers/applications/me">פורטל המפתחים של Discord</a>)'
-    discord_secret: 'מפתח סודי של Discord'
+    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: "לאפשר למנהלים ליצור גיבויים של הפורום"
@@ -1738,6 +1747,9 @@ he:
     private_email: "לא כלול תוכן מפוסטים או נושאים בכותרת או בגוף הודעת הדוא״ל. לתשומת לבך: גם הודעות התמצית תבוטלנה."
     email_total_attachment_size_limit_kb: "הגודל הכולל המרבי של קבצים שמצורפים להודעות דוא״ל יוצאות. 0 כדי לנטרל שליחת צרופות."
     post_excerpts_in_emails: "בהודעות ההתראה, תמיד לשלוח מקטעים קצרים במקום את כל הפוסט"
+    raw_email_max_length: "כמה תווים יאוחסנו מדוא״ל שנכנס."
+    raw_rejected_email_max_length: "כמה תווים יאוחסנו מדוא״ל שנדחה."
+    delete_rejected_email_after_days: "מחיקת הודעות שנדחו לפני למעלה מ־(n) ימים"
     manual_polling_enabled: "דחיפת מיילים באמצעות ה API לתגובות מייל."
     pop3_polling_enabled: "משיכה דרך POP3 לתגובות דוא\"ל."
     pop3_polling_ssl: "שימוש ב-SSL בעת חיבור לשרת POP3. (מומלץ)"
@@ -1796,6 +1808,7 @@ he:
     ignored_users_count_message_threshold: "להודיע למפקחים במקרה שמשתמש מסוים זכה לחסימות מצד משתמשים רבים אחרים."
     ignored_users_message_gap_days: "כמה זמן להמתין בטרם שליחת הודעה נוספת למפקחים בנוגע למשתמש שזכה לחסימות מצד משתמשים רבים."
     clean_up_inactive_users_after_days: "מספר הימים בטרם הסרת משתמש בלתי פעיל (דרגת אמון 0 ללא פוסטים). כדי להשבית את הפינוי יש להגדיר ל־0."
+    user_selected_primary_groups: "לאפשר למשתמשים להגדיר את הקבוצה העיקרית של עצמם"
     user_website_domains_whitelist: "אתרי משתמשים יאומתו עם מתחמים אלו. רשימה מופרדת על ידי קווים-אנכיים."
     allow_profile_backgrounds: "אפשרו למשתמשים להעלות רקעים לפרופיל."
     sequential_replies_threshold: "מספר הפוסטים שעל משתמש לפרסם אחד-לאחר-השני בנושא לפני שמזכירים לו שהוא משאיר יותר מידי תגובות ברצף."
@@ -1840,7 +1853,7 @@ he:
     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: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד."
     slug_generation_method: "בחרו צורת ייצור slug. צורה של 'encoded' תגרום למחרוזות עם קידוד אחוזים. 'none' ינטרל slug לחלוטין."
@@ -1885,6 +1898,10 @@ he:
     default_categories_tracking: "רשימת קטגוריות שנעקבת כברירת מחדל."
     default_categories_muted: "רשימת קטגוריות שמושתקות כברירת מחדל."
     default_categories_watching_first_post: "רשימת קטגוריות שבה הפוסט הראשון בכל נושא ייצפה אוטומטית."
+    default_tags_watching: "רשימת תגיות שבצפייה כבררת מחדל."
+    default_tags_tracking: "רשימת תגיות שבמעקב כבררת מחדל"
+    default_tags_muted: "רשימת תגיות שמושתקות כבררת מחדל."
+    default_tags_watching_first_post: "רשימת תגיות שעבורן פוסט ראשון בכל נושא חדש יצטרף לצפייה כבררת מחדל."
     default_text_size: "גודל הטקסט שנבחר כבררת מחדל"
     default_title_count_mode: "מצב בררת מחדל למונה כותרות עמודים"
     retain_web_hook_events_period_days: "מספר הימים לשמירת רשומות אירועי התלייה."
@@ -1977,6 +1994,8 @@ he:
       topic: "תוצאות"
       user: "משתמשים"
     results_page: "תוצאות לחיפוש אחר ‚%{term}’"
+    audio: "[שמע]"
+    video: "[וידאו]"
   sso:
     login_error: "תקלת התחברות"
     not_found: "לא מצאנו את החשבון שלכם. אנא צרו קשר עם מנהל האתר."
@@ -2295,9 +2314,9 @@ he:
     title: "אישור אדמיניסטרטור"
     subject_template: "[%{email_prefix}] אישור חשבון חדש"
     text_body_template: |
-      בבקשה אשרו שהייתם מעוניינים להוסיף את **%{target_username}** כאדמיניסטרטור של הפורום שלכם.
+      נא לאשר שברצונך להוסיף את **%{target_username} (%{target_email})** לסגל הניהולי של הפורום שלך.
 
-      [Confirm Administrator Account](%{admin_confirm_url})
+      [אישור משתמש ניהולי](%{admin_confirm_url})
   test_mailer:
     title: "שולח-מיילים לבדיקה"
     subject_template: "[%{email_prefix}] מייל בדיקת שליחתיות"
@@ -2490,6 +2509,15 @@ he:
       text_body_template: |
         אהלן. שמנו לב שקריאת הפורום מעסיקה אותך רבות, שזה נהדר, לכן קידמנו את  [דרגת האמון](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) בך!
         אנו מאוד שמחים לראות שנעים לך לקחת חלק בפעילות הקהילתית ונשמח לדעת עוד עליך. ממליצים לך להשקיע רגע קט כדי [למלא את הפרופיל שלך](%{base_url}/my/preferences/profile), או סתם [לפתוח דיון חדש](%{base_url}/categories).
+    welcome_moderator:
+      title: "ברוך בואך לצוות הפיקוח"
+      subject_template: "ברכותינו, הרשאותיך מעתה מאפשרות לך לפקח!"
+      text_body_template: |
+        הוענק לך מצב פיקוח על ידי מישהו מבין חברי הסגל.
+
+        הרשאות פיקוח מעניקות לך גישה אל <a href='%{base_url}/admin' target='_blank'>מנשק הניהול</a>.
+
+        כוח רב טומן בחובו אחריות רבה. אם תחום הפיקוח זר לך, ניתן לפנות אל [המדריך למפקחים](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "הזמנת ברוכים הבאים"
       subject_template: "ברוכים הבאים ל %{site_name}!"
@@ -2934,36 +2962,35 @@ he:
     visit_link_to_respond_pm: "יש [לבקר בהודעה](%{base_url}%{url}) כדי להגיב אל %{participants}."
     posted_by: "פורסם על ידי %{username} ב %{post_date}"
     pm_participants: "משתתפים: %{participants}"
-    invited_group_to_private_message_body: |
-      הקבוצה @%{group_name} הוזמנה על ידי %{username} להודעה
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      תחת
-
-      > %{site_title} -- %{site_description}
+    invited_group_to_private_message_body: "הקבוצה  @%{group_name} הוזמנה להתכתבות על ידי %{username} \n\n> **[%{topic_title}](%{topic_url})**\n>\n> %{topic_excerpt}\n\nבאתר\n\n> %{site_title} -- %{site_description}\n\nכדי להצטרף להודעה יש ללחוץ על הקישור שלהלן:\n\n%{topic_url}\n"
     invited_to_private_message_body: |
-      קיבלת הזמנה להודעה מאת %{username}
+      הוזמנת להתכתב על ידי%{username}
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
       באתר
 
       > %{site_title} -- %{site_description}
+
+      כדי להצטרף להודעה יש ללחוץ על הקישור שלהלן:
+
+      %{topic_url}
     invited_to_topic_body: |
-      קיבלת הזמנה לדיון מאת %{username}
+      הוזמנת לדיון על ידי %{username}
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
       באתר
 
       > %{site_title} -- %{site_description}
+
+      כדי להצטרף לדיון יש ללחוץ על הקישור שלהלן:
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "משתמש הזמין קבוצה להודעה פרטית"
       subject_template: "[%{email_prefix}] ‎@%{group_name}‎ הוזמנה להודעה ‚%{topic_title}’ על ידי %{username}"
@@ -3341,7 +3368,7 @@ he:
     missing: "מצטערים, אנחנו לא יכולים למצוא אף דמות שמקושרת לכתובת מייל זו. תוכלו להעלות זאת שוב?"
   flag_reason:
     sockpuppet: "משתמש חדש יצר נושא, ומשתמש חדש אחר מאותה כתובת IP (%{ip_address}) ענו להם. ראו את הגדרת האתר <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "משתמש חדש זה ניסה ליצור מספר פוסטים עם קישורים לאותה הכתובת. ראו את הגדרת האתר <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "משתמש חדש זה ניסה ליצור מספר פוסטים עם קישורים לאותו שם המתחם. כל הפוסטים מאת המשתמש הזה שכוללים קישורים דורשים סקירה. יש לעיין בהגדרת האתר <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> (סף ספאם מארח למשתמש חדש)."
   skipped_email_log:
     exceeded_emails_limit: "נחצה max_emails_per_day_per_user"
     exceeded_bounces_limit: "נחצה bounce_score_threshold"
@@ -3859,6 +3886,11 @@ he:
         two: '„%{tag_name}” מוגבלת לקטגוריות הבאות: %{category_names}'
         many: '„%{tag_name}” מוגבלת לקטגוריות הבאות: %{category_names}'
         other: '„%{tag_name}” מוגבלת לקטגוריות הבאות: %{category_names}'
+    required_tags_from_group:
+      one: "עליך לכלול תגית %{tag_group_name} %{count} לפחות"
+      two: "עליך לכלול %{count} תגיות %{tag_group_name} לפחות"
+      many: "עליך לכלול %{count} תגיות %{tag_group_name} לפחות"
+      other: "עליך לכלול %{count} תגיות %{tag_group_name} לפחות"
   rss_by_tag: "נושאים מתוייגים %{tag}"
   finish_installation:
     congratulations: "ברכותינו, התקנת את Discourse!"
@@ -4136,4 +4168,4 @@ he:
   email_style:
     html_missing_placeholder: "תבנית ה־html חייבת לכלול %{placeholder}"
   discord:
-    not_in_allowed_guild: 'האימות נכשל. הגילדה ב־Discord אליה הצטרפת אינה מורשית לגשת.'
+    not_in_allowed_guild: "האימות נכשל. הגילדה ב־Discord אליה הצטרפת אינה מורשית לגשת."
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 80861d200c..7e1033b216 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -85,7 +85,6 @@ hu:
         empty_email_error: "Akkor fordul elő, ha üres volt a kapott nyers e-mail."
         no_message_id_error: "Akkor történik, ha a levélnek nincs „Message-Id” fejléce."
         inactive_user_error: "Akkor fordul elő, ha a feladó nem aktív."
-        bad_destination_address: "Akkor fordul elő, ha a Címzett/Másolatot kap/Vakmásolatot kap mezőkben lévő email címek egyike sem illeszkedik a beállított beérkező e-mail címhez."
         strangers_not_allowed_error: "Akkor fordul elő, ha a felhasználó új témát akar létrehozni egy olyan kategóriában, amelynek nem tagja."
       unrecognized_error: "Ismeretlen hiba"
   errors: &errors
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 30c6a94022..0c0bab06d0 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -89,7 +89,6 @@ hy:
         from_reply_by_address_error: "Պատահում է, երբ Ումից վերնագիրը համընկնում է էլ. հասցեի միջոցով պատասխանին:"
         inactive_user_error: "Պատահում է, երբ ուղարկողը ակտիվ չէ:"
         silenced_user_error: "Պատահում է, երբ ուղարկողը լռեցված է:"
-        bad_destination_address: "Պատահում է, երբ To/Cc/Bcc դաշտերի էլ. հասցեներից ոչ մեկը չի համընկնում կարգավորված մուտքային էլ. հասցեին:"
         strangers_not_allowed_error: "Պատահում է, երբ օգտատերը փորձում է ստեղծել նոր թեմա մի կատեգորիայում, որի անդամ չէ:"
         insufficient_trust_level_error: "Պատահում է, երբ օգտատերը փորձում է ստեղծել նոր թեմա այնպիսի կատեգորիայում, որի պահանջվող վստահության մակարդակը չունի:"
         reply_user_not_matching_error: "Պատահում է, երբ պատասխանը գալիս է այնպիսի էլ. հասցեից, որը տարբերվում է այն էլ. հասցեից, որին ուղարկվել է ծանուցումը:"
@@ -639,7 +638,6 @@ hy:
     activated: "Ներողություն, այս հաշիվը արդեն ակտիվացված է:"
     admin_confirm:
       title: "Հաստատել Ադմինի Հաշիվը"
-      description: "Դուք համոզվա՞ծ եք, որ ցանկանում եք, որ <b>%{target_username}</b> -ը լինի ադմինիստրատոր:"
       grant: "Շնորհել Ադմինի Հասանելիություն"
       complete: "<b>%{target_username}</b>-ը այժմ ադմինիստրատոր է:"
       back_to: "Վերադառնալ դեպի %{title}"
@@ -1958,10 +1956,6 @@ hy:
   admin_confirmation_mailer:
     title: "Ադմինի Հաստատում"
     subject_template: "[%{email_prefix}] Հաստատել նոր Ադմինի Հաշիվ "
-    text_body_template: |
-      Խնդրում ենք հաստատել, որ Դուք ցանկանում եք ավելացնել **%{target_username}**-ին՝ որպես Ձեր ֆորումի ադմինիստրատոր:
-
-      [Հաստատել Ադմինիստրատորի Հաշիվը](%{admin_confirm_url})
   test_mailer:
     title: "Փորձարկել Ուղարկողին"
     subject_template: "[%{email_prefix}] Էլ. Նամակի Հասանելիության Փորձարկում"
@@ -2457,36 +2451,6 @@ hy:
     visit_link_to_respond_pm: "[Դիտեք Հաղորդագրությունը՝](%{base_url}%{url}) %{participants} -ին պատասխանելու համար:"
     posted_by: "Հրապարակված է %{username} -ի կողմից՝ %{post_date}"
     pm_participants: "Մասնակիցներ՝ %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} -ը հրավիրել է @%{group_name} -ին հաղորդագրության
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      այստեղ՝
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} -ը հրավիրել է Ձեզ հաղորդագրությանը՝
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} -ը հրավիրել է Ձեզ քննարկման
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      այստեղ՝
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Օգտատերը Հրավիրել է Խմբին Անձնական Նամակագրության:"
       subject_template: "[%{email_prefix}] %{username} -ը հրավիրել է @%{group_name} -ին '%{topic_title}' հաղորդագրությանը"
@@ -2842,7 +2806,6 @@ hy:
     missing: "Ներողություն, մենք չենք կարողանում գտնել այդ էլ. հասցեի հետ կապակցված որևէ ավատար: Կարո՞ղ եք փորձել վերբեռնել այն կրկին:"
   flag_reason:
     sockpuppet: "Նոր օգտատերը ստեղծել է թեմա, և մեկ այլ օգտատեր միևնույն IP հասցով address (%{ip_address}) պատասխանել է: Այցելեք <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> կայքի կարգավորումներ:"
-    spam_hosts: "Այս նոր օգտատերը փորձել է ստեղծել բազմակի գրառումներ միևնույն դոմենի (%{domain}) հղումներով: Դիտեք See the <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> կայքի կարգավորումը:"
   skipped_email_log:
     exceeded_emails_limit: "Գերազանցում է max_emails_per_day_per_user"
     exceeded_bounces_limit: "Գերազանցում է bounce_score_threshold"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 9aa94b4135..f0b950e0bc 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -91,7 +91,6 @@ it:
         from_reply_by_address_error: "Accade quando l'intestazione From corrisponde alla risposta per indirizzo email."
         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 presenti nei campi A/Cc/Ccn corrisponde ad alcun indirizzo email entrante tra quelli configurati."
         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."
@@ -712,7 +711,6 @@ it:
     activated: "Spiacenti, questo account è stato già attivato."
     admin_confirm:
       title: "Conferma Account Amministratore"
-      description: "Sei sicuro di volere rendere<b>%{target_username}</b> un amministratore?"
       grant: "Assegna Accesso Amministratore"
       complete: "<b>%{target_username}</b>è ora un amministratore."
       back_to: "Torna a %{title}"
@@ -1724,7 +1722,7 @@ it:
     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."
     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.
+    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)"
     prevent_anons_from_downloading_files: "Impedire agli utenti anonimi di scaricare gli allegati. ATTENZIONE: questo impedirà a qualsiasi risorsa del sito pubblicata come allegato di funzionare ad eccezione delle immagini."
     slug_generation_method: "Scegli un metodo di generazione delle abbreviazioni. 'encoded' genererà la stringa di codifica percentuale. 'none' disattiverà completamente le abbreviazioni."
@@ -2113,10 +2111,6 @@ it:
   admin_confirmation_mailer:
     title: "Conferma Amministratore"
     subject_template: "[%{email_prefix}] Conferma nuovo Account Amministratore"
-    text_body_template: |
-      Conferma che desideri aggiungere **%{target_username}** come amministratore del tuo forum.
-
-      [Conferma Account Amministratore](%{admin_confirm_url})
   test_mailer:
     title: "Test Mailer"
     subject_template: "[%{email_prefix}] Test di Consegna Email"
@@ -2614,36 +2608,6 @@ it:
     visit_link_to_respond_pm: "[Visita messaggio] (%{base_url}%{url}) per rispondere a %{participants}."
     posted_by: "Pubblicato da %{username} il %{post_date}"
     pm_participants: "Partecipanti: %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} ha invitato @%{group_name} a partecipare al messaggio
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      su
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} ti ha invitato a partecipare al messaggio
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      su
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} ti ha invitato alla discussione
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      su
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Gruppo Invitato da Utente ad un MP"
       subject_template: "[%{email_prefix}] %{username} ha invitato @%{group_name} a partecipare al messaggio '%{topic_title}'"
@@ -2991,7 +2955,6 @@ it:
     missing: "Spiacenti, non troviamo nessun avatar associato a questo indirizzo email. Puoi provare a caricarlo nuovamente?"
   flag_reason:
     sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto dallo stesso indirizzo IP (%{ip_address}). Vedi l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio. Vedi l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Ha superato max_emails_per_day_per_user"
     exceeded_bounces_limit: "Ha superato bounce_score_threshold"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index ad0ca29e68..529d544a95 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -990,7 +990,7 @@ ja:
     embed_truncate: "embedされた投稿をtruncateする"
     embed_post_limit: "表示可能な投稿の最大数を埋め込む"
     show_create_topics_notice: "サイトにpublicなトピックが5よりも少ない場合、トピックを作成するための通知が管理者に表示される"
-    delete_drafts_older_than_n_days: (n) 日間経過したドラフトを削除
+    delete_drafts_older_than_n_days: "(n) 日間経過したドラフトを削除"
     prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードするのを防止。警告: 画像ではなく、添付ファイルとして投稿された全てのファイルが対象です"
     slug_generation_method: "slugを生成するメソッドを選択。 'encode'はパーセントエンコードされた文字列を生成します。 'none'は、slugを無効にします"
     enable_emoji: "絵文字を有効にする"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 086c82074b..9b6aeb0811 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -61,7 +61,6 @@ ko:
         auto_generated_email_error: "'precedence'헤더가 list, junk, bulk, auto_reply로 설정되어 있거나 다른 헤더에 auto-submitted, auto-replied, auto-generated가 있을 때 발생합니다."
         no_body_detected_error: "body를 추출할 수 없거나 첨부파일이 없을 때 발생합니다."
         inactive_user_error: "발신자(sender)가 비활성상태일 때 발생합니다."
-        bad_destination_address: "수신/참조/비밀참조 필드에 있는 이메일 주소가 설정된 수신 이메일 주소와 하나도 매칭되지 않을 때 발생합니다."
         strangers_not_allowed_error: "사용자가 자신이 속하지 않은 카테고리에 토픽 생성을 시도할 때 발생합니다."
         insufficient_trust_level_error: "사용자가 더 높은 신뢰 레벨이 필요한 카테고리에 토픽 생성을 시도할 때 발생합니다."
         reply_user_not_matching_error: "발신한 알림에 대하여 서로 다른 이메일로 답장이 올 때 발생합니다."
@@ -529,7 +528,6 @@ ko:
     activated: "죄송합니다. 이 계정은 이미 활성화되었습니다."
     admin_confirm:
       title: "관리자 계정 확정하기"
-      description: "<b>%{target_username}</b>님을 관리자로 설정하고 싶은 것이 확실합니까?"
       grant: "관리자 권한 부여"
       complete: "<b>%{target_username}</b> 님은 이제 관리자입니다."
       back_to: "%{title}로 돌아가기"
@@ -1240,7 +1238,7 @@ ko:
     embed_post_limit: "글 개수가 최대치입니다."
     embed_username_required: "토픽 생성을 위한 사용자명이 필요합니다."
     show_create_topics_notice: "이 사이트에 5개 이하의 공개 글타래가 있으면, 관리자에게 글타래 좀 만들라고 알려줍니다."
-    delete_drafts_older_than_n_days: (n) 일지난 임시 보관글 삭제하기
+    delete_drafts_older_than_n_days: "(n) 일지난 임시 보관글 삭제하기"
     prevent_anons_from_downloading_files: "익명 사용자가 다운로드를 받지 못하게 합니다. 경고: 이미지 파일 외 모든 첨부파일이 다운로드 받지 못하게 됩니다."
     slug_generation_method: "slug 생성 방식. 'encoded'는 퍼센트 기호로 인코딩해서 생성합니다. 'none'은 slug 자체를 비활성화합니다.."
     enable_emoji: "emoji 활성화"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 295cfcc1fd..283ba4c69a 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -75,7 +75,6 @@ nb_NO:
         from_reply_by_address_error: "Skjer når avsender i meldingshodet er identisk med den konfigurerte adressen for svar via e-post."
         inactive_user_error: "Skjer når senderen ikke er aktiv."
         silenced_user_error: "Skjer når senderen er dempet."
-        bad_destination_address: "Skjer når ingen av adressene i To-, Cc- eller Bcc-feltene passer med en konfigurert innkommende e-postadresse."
         strangers_not_allowed_error: "Skjer når en bruker har forsøkt å opprette et nytt emne i en kategori som vedkommende ikke er medlem av."
         insufficient_trust_level_error: "Skjer når en bruker har forsøkt å opprette et nytt emne i en kategori som vedkommende ikke har påkrevet tillitsnivå for."
         reply_user_not_matching_error: "Skjer når et innkommende svar kommer fra en annen e-postadresse enn varselet var sendt til."
@@ -592,7 +591,6 @@ nb_NO:
     activated: "Beklager, denne kontoen er allerede aktivert."
     admin_confirm:
       title: "Bekreft admin-konto"
-      description: "Er du sikker på at du ønsker at <b>%{target_username}</b> skal være en administrator?"
       grant: "Tildel admin-tilgang"
       complete: "<b>%{target_username}</b> er nå en administrator."
       back_to: "Gå tilbake til %{title}"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 2409e6e5bc..7e94f923fd 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -92,7 +92,7 @@ nl:
         from_reply_by_address_error: "Gebeurt wanneer de Van-header overeenkomt met het adres voor antwoorden per e-mail."
         inactive_user_error: "Gebeurt wanneer de afzender niet actief is."
         silenced_user_error: "Gebeurt wanneer de afzender is gedempt."
-        bad_destination_address: "Gebeurt wanneer geen van de e-mailadressen in de Aan/Cc/Bcc-velden overeenkwam met een geconfigureerd adres voor inkomende e-mail."
+        bad_destination_address: "Gebeurt wanneer geen van de e-mailadressen in de Aan/Cc-velden overeenkwam met een geconfigureerd adres voor inkomende e-mail."
         strangers_not_allowed_error: "Gebeurt wanneer een gebruiker een nieuw topic probeerde aan te maken in een categorie waarvan hij/zij geen lid is."
         insufficient_trust_level_error: "Gebeurt wanneer een gebruiker een nieuw topic probeerde aan te maken in een categorie waarvoor hij/zij niet het vereiste vertrouwensniveau heeft."
         reply_user_not_matching_error: "Gebeurt wanneer een antwoord van een ander e-mailadres kwam dan waar de melding naartoe is gestuurd."
@@ -161,6 +161,7 @@ nl:
         one: "U hebt de ongeldige keuze %{name} opgegeven"
         other: "U hebt de ongeldige keuzes %{name} opgegeven"
       default_categories_already_selected: "U kunt geen categorie selecteren die in een andere lijst wordt gebruikt."
+      default_tags_already_selected: "U kunt geen tag selecteren die in een andere lijst wordt gebruikt."
       s3_upload_bucket_is_required: "U kunt geen uploads naar S3 toestaan voordat u de 's3_upload_bucket' hebt opgegeven."
       enable_s3_uploads_is_required: "U kunt geen inventory naar S3 inschakelen voordat u de S3-uploads hebt ingeschakeld."
       s3_backup_requires_s3_settings: "U kunt S3 niet als back-uplocatie gebruiken voordat u de '%{setting_name}' hebt opgegeven."
@@ -247,6 +248,7 @@ nl:
       other: "%{count} likes"
     last_reply: "Laatste antwoord"
     created: "Gemaakt"
+    new_topic: "Nieuw topic maken"
   no_mentions_allowed: "Sorry, u kunt geen andere gebruikers noemen."
   too_many_mentions:
     one: "Sorry, u kunt maar één andere gebruiker in een bericht noemen."
@@ -734,7 +736,7 @@ nl:
     activated: "Sorry, deze account is al geactiveerd."
     admin_confirm:
       title: "Beheerdersaccount bevestigen"
-      description: "Weet u zeker dat u <b>%{target_username}</b> een beheerder wilt laten worden?"
+      description: "Weet u zeker dat u <b>%{target_username} (%{target_email})</b> een beheerder wilt laten worden?"
       grant: "Beheerderstoegang verlenen"
       complete: "<b>%{target_username}</b> is nu een beheerder."
       back_to: "Terug naar %{title}"
@@ -783,6 +785,13 @@ nl:
       description: "Dit bericht liken"
       short_description: "Dit bericht liken"
       long_form: "liket dit bericht"
+  draft:
+    sequence_conflict_error:
+      title: "conceptfout"
+      description: "Concept wordt in een ander venster bewerkt. Vernieuw deze pagina."
+  draft_backup:
+    pm_title: "Back-upconcepten van actieve topics"
+    pm_body: "Topic dat back-upconcepten bevat"
   user_activity:
     no_default:
       self: "U hebt nog geen activiteit."
@@ -800,18 +809,18 @@ nl:
       self: "U hebt geen concepten; begin met het opstellen van een antwoord in een topic en het wordt automatisch als nieuw concept opgeslagen."
   webauthn:
     validation:
-      invalid_type_error: 'Het opgegeven type webauthn was ongeldig. Geldige typen zijn webauthn.get en webauthn.create.'
-      challenge_mismatch_error: 'De opgegeven vraag komt niet overeen met de door de authenticatieserver gegenereerde vraag.'
-      invalid_origin_error: 'De oorsprong van de authenticatieaanvraag komt niet overeen met de serveroorsprong.'
-      malformed_attestation_error: 'Er is een fout opgetreden bij het decoderen van de attestgegevens.'
-      invalid_relying_party_id_error: 'De Relying Party-ID van de authenticatieaanvraag komt niet overeen met de Relying Party-ID van de server.'
-      user_verification_error: 'Er is gebruikersverificatie vereist.'
-      unsupported_public_key_algorithm_error: 'Het opgegeven algoritme van de openbare sleutel wordt niet ondersteund door de server.'
-      unsupported_attestation_format_error: 'De attestation-indeling wordt niet ondersteund door de server.'
-      credential_id_in_use_error: 'De opgegeven referentie-ID is al in gebruik.'
-      public_key_error: 'De verificatie van de openbare sleutel voor de referentie is mislukt.'
-      ownership_error: 'De beveiligingssleutel behoort niet toe aan de gebruiker.'
-      not_found_error: 'Er kon geen beveiligingssleutel met de opgegeven referentie-ID worden gevonden.'
+      invalid_type_error: "Het opgegeven type webauthn was ongeldig. Geldige typen zijn webauthn.get en webauthn.create."
+      challenge_mismatch_error: "De opgegeven vraag komt niet overeen met de door de authenticatieserver gegenereerde vraag."
+      invalid_origin_error: "De oorsprong van de authenticatieaanvraag komt niet overeen met de serveroorsprong."
+      malformed_attestation_error: "Er is een fout opgetreden bij het decoderen van de attestgegevens."
+      invalid_relying_party_id_error: "De Relying Party-ID van de authenticatieaanvraag komt niet overeen met de Relying Party-ID van de server."
+      user_verification_error: "Er is gebruikersverificatie vereist."
+      unsupported_public_key_algorithm_error: "Het opgegeven algoritme van de openbare sleutel wordt niet ondersteund door de server."
+      unsupported_attestation_format_error: "De attestation-indeling wordt niet ondersteund door de server."
+      credential_id_in_use_error: "De opgegeven referentie-ID is al in gebruik."
+      public_key_error: "De verificatie van de openbare sleutel voor de referentie is mislukt."
+      ownership_error: "De beveiligingssleutel behoort niet toe aan de gebruiker."
+      not_found_error: "Er kon geen beveiligingssleutel met de opgegeven referentie-ID worden gevonden."
   topic_flag_types:
     spam:
       title: "Spam"
@@ -1285,7 +1294,7 @@ nl:
     editing_grace_period_max_diff_high_trust: "Maximale aantal toegestane tekenwijzigingen in wachtperiode voor bewerken; bij meer wijzigingen een andere berichtrevisie bewaren (vertrouwensniveau 1 en 2)"
     staff_edit_locks_post: "Berichten worden vergrendeld voor bewerking als ze door stafleden worden bewerkt"
     post_edit_time_limit: "Een TL0- of TL1-schrijver kan een eigen bericht (n) minuten na plaatsing bewerken. Stel dit in op 0 voor altijd."
-    tl2_post_edit_time_limit: "Een TL2-schrijver kan een eigen bericht (n) minuten na plaatsing bewerken. Stel dit in op 0 voor altijd."
+    tl2_post_edit_time_limit: "Een TL2+-schrijver kan een eigen bericht (n) minuten na plaatsing bewerken. Stel dit in op 0 voor altijd."
     edit_history_visible_to_public: "Toestaan dat iedereen vorige versies van een bewerkt bericht kan zien. Als dit is uitgeschakeld, kunnen alleen stafleden dat bekijken."
     delete_removed_posts_after: "Door de schrijver verwijderde berichten worden na (n) uur automatisch verwijderd. Als dit ingesteld is op 0, worden berichten direct verwijderd."
     max_image_width: "Maximale miniatuurbreedte van afbeeldingen in een bericht"
@@ -1455,9 +1464,9 @@ nl:
     enable_github_logins: "Github-authenticatie inschakelen, vereist github_client_id en github_client_secret. Zie <a href='https://meta.discourse.org/t/13745' target='_blank'>Configuring GitHub login for Discourse</a>."
     github_client_id: "Client-ID voor Github-authenticatie, geregistreerd bij <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Client-geheim voor Github-authenticatie, geregistreerd bij <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    enable_discord_logins: 'Mogen gebruikers authenticeren via Discord?'
+    enable_discord_logins: "Mogen gebruikers authenticeren via Discord?"
     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_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: "Administrators mogen back-ups van het forum maken"
@@ -1668,6 +1677,9 @@ nl:
     private_email: "Geen inhoud van berichten of topics in titel of tekst van e-mail opnemen. OPMERKING: schakelt ook e-mailsamenvattingen uit."
     email_total_attachment_size_limit_kb: "Maximale totale grootte van aan uitgaande e-mails gekoppelde bestanden. Stel dit in op 0 om het verzenden van bijlagen uit te schakelen."
     post_excerpts_in_emails: "In meldingen per e-mail altijd fragmenten sturen in plaats van volledige berichten"
+    raw_email_max_length: "Hoeveel tekens moeten worden opgeslagen voor inkomende e-mail."
+    raw_rejected_email_max_length: "Hoeveel tekens moeten worden opgeslagen voor geweigerde inkomende e-mail."
+    delete_rejected_email_after_days: "Geweigerde e-mails ouder dan (n) dagen verwijderen."
     manual_polling_enabled: "E-mails pushen via de API voor e-mailantwoorden."
     pop3_polling_enabled: "Pollen via POP3 voor e-mailantwoorden."
     pop3_polling_ssl: "SSL gebruiken bij verbinden met de POP3-server. (Aanbevolen)"
@@ -1726,6 +1738,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."
+    user_selected_primary_groups: "Gebruikers mogen hun eigen primaire groep instellen"
     user_website_domains_whitelist: "Website van gebruiker wordt op deze domeinen gecontroleerd. Door pipes gescheiden lijst."
     allow_profile_backgrounds: "Gebruikers mogen profielachtergronden uploaden."
     sequential_replies_threshold: "Aantal berichten dat een gebruiker achter elkaar in één topic moet plaatsen voordat deze aan te veel opeenvolgende reacties wordt herinnerd."
@@ -1770,7 +1783,7 @@ nl:
     embed_username_required: "De gebruikersnaam voor het maken van topics is vereist."
     notify_about_flags_after: "Als er na dit aantal uren markeringen zijn die nog niet zijn afgehandeld, een privébericht naar stafleden sturen. Stel dit in op 0 om uit te schakelen."
     show_create_topics_notice: "Als de website minder dan 5 publieke topics heeft, een melding tonen waarin beheerders wordt gevraagd een aantal topics te maken."
-    delete_drafts_older_than_n_days: Concepten ouder dan (n) dagen verwijderen.
+    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."
     slug_generation_method: "Kies een slug-generatiemodus. 'encoded' genereert een percentage-coderingsstring. 'none' schakelt de slug helemaal uit."
@@ -1815,6 +1828,10 @@ nl:
     default_categories_tracking: "Lijst van categorieën die standaard worden gevolgd."
     default_categories_muted: "Lijst van categorieën die standaard worden gedempt."
     default_categories_watching_first_post: "Lijst van categorieën waarin het eerste bericht in elk nieuw topic standaard in de gaten wordt gehouden."
+    default_tags_watching: "Lijst van tags die standaard in de gaten worden gehouden."
+    default_tags_tracking: "Lijst van tags die standaard worden gevolgd."
+    default_tags_muted: "Lijst van tags die standaard worden gedempt."
+    default_tags_watching_first_post: "Lijst van tags waarin het eerste bericht in elk nieuw topic standaard in de gaten wordt gehouden."
     default_text_size: "Tekstgrootte die standaard is geselecteerd"
     default_title_count_mode: "Standaardmodus voor de paginatitelteller"
     retain_web_hook_events_period_days: "Aantal dagen voor het behouden van records van webhookgebeurtenissen."
@@ -1907,6 +1924,8 @@ nl:
       topic: "Resultaten"
       user: "Gebruikers"
     results_page: "Zoekresultaten voor '%{term}'"
+    audio: "[audio]"
+    video: "[video]"
   sso:
     login_error: "Aanmeldingsfout"
     not_found: "Uw account kon niet worden gevonden. Neem contact op met de beheerder van de website."
@@ -2387,7 +2406,6 @@ nl:
     missing: "Sorry, we kunnen geen avatar vinden die met dat e-mailadres is gekoppeld. Kunt u proberen deze opnieuw te uploaden?"
   flag_reason:
     sockpuppet: "Een nieuwe gebruiker heeft een topic aangemaakt, en een andere nieuwe gebruiker op hetzelfde IP-adres (%{ip_address}) heeft geantwoord. Bekijk de website-instelling <a href='%{base_path}/admin/site_settings/category/spam'>'flag_sockpuppets'</a>."
-    spam_hosts: "Deze nieuwe gebruiker heeft geprobeerd meerdere berichten met koppelingen naar hetzelfde domein aan te maken. Bekijk de website-instelling <a href='%{base_path}/admin/site_settings/category/spam'>newuser_spam_host_threshold</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user overschreden"
     exceeded_bounces_limit: "bounce_score_threshold overschreden"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index d217b61d4a..c6924dcdee 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -49,6 +49,7 @@ pl_PL:
       about_json_values: "Plik about.json zawiera niepoprawne 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."
       unknown_file_type: "Przesłany plik nie spełnia wymagań poprawnego motywu Discourse."
     errors:
       component_no_user_selectable: "Komponenty motywu nie mogą być dobieralne przez użytkowników"
@@ -85,10 +86,10 @@ pl_PL:
         empty_email_error: "Zdarza się kiedy mail jaki dostaliśmy jest pusty."
         no_message_id_error: "Zdarza się kiedy email nie posiada nagłówka 'Message-Id'."
         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że rozpakować całości wiadomości, a zawarte są w niej załączniki."
+        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."
         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 adres email nie pasuje do pól To/Cc/Bcc skonfigurowanych jako przychodzący adres email."
         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."
@@ -96,6 +97,7 @@ pl_PL:
         topic_closed_error: "Zdarza się kiedy pojawia się odpowiedź, ale powiązany temat został zamknięty."
         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."
       unrecognized_error: "Niezidentyfikowany błąd"
   errors: &errors
     format: "%{attribute} %{message}"
@@ -158,6 +160,11 @@ pl_PL:
       load_from_remote: "Wystąpił błąd podczas wczytywania tego wpisu."
     site_settings:
       invalid_category_id: "Podana kategoria nie istnieje"
+      invalid_choice:
+        one: "Podano nieprawidłowy wybór %{name}"
+        few: "Podano nieprawidłowe opcje %{name}"
+        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."
       s3_upload_bucket_is_required: "Nie możesz wysyłać na S3 jeżeli nie podasz 's3_upload_bucket'."
       s3_backup_requires_s3_settings: "Nie możesz używać S3 do tworzenia kopii zapasowych bez podania \"%{setting_name}\"."
@@ -198,6 +205,8 @@ pl_PL:
   read_only_mode_enabled: "Strona jest w trybie tylko do odczytu. Możliwość interakcji jest wyłączona."
   email_template_cant_be_modified: "Ten szablon e-mail nie może być zmodyfikowany"
   not_in_group:
+    title_topic: "Musisz być w grupie, aby zobaczyć ten temat."
+    request_membership: "Poproś o członkostwo"
     join_group: "Dołącz do grupy"
   reading_time: "Czas odczytu"
   likes: "Lajki"
@@ -750,7 +759,6 @@ pl_PL:
     activated: "Przepraszamy, to konto zostało już aktywowane."
     admin_confirm:
       title: "Potwierdź konto administratora"
-      description: "Czy jesteś pewny, że chcesz nadać użytkownikowi <b>%{target_username}</b> uprawnienia administratora?"
       grant: "Przynaj prawa Admina"
       complete: "<b>%{target_username}</b> jest teraz administratorem."
       back_to: "Wróć do %{title}"
@@ -1531,7 +1539,7 @@ pl_PL:
     embed_post_limit: "Maksymalna liczba postów do osadzenia."
     embed_username_required: "W celu stworzenia tematu potrzebna jest nazwa użytkownika."
     show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe wątki."
-    delete_drafts_older_than_n_days: Usuń projekty starsze niż (n) dni.
+    delete_drafts_older_than_n_days: "Usuń projekty starsze niż (n) dni."
     bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
     prevent_anons_from_downloading_files: "Zapobiegaj pobieraniu załączników przez anonimowych użytkowników. Ostrzeżenie: wszystkie dodane załączniku nie będące obrazkami nie będą działały."
     slug_generation_method: "Wybierz metodę tworzenia ślimaka. 'Zakodowane\" stworzy procentowy ciąg kodujący, \"żadne\" wyłączy tą metodę."
@@ -1579,8 +1587,11 @@ pl_PL:
     tag_style: "Styl etykiet tagów"
     min_trust_level_to_tag_topics: "Minimalny poziom zaufania wymagany do tagowania tematów"
     suppress_overlapping_tags_in_list: "Jeśli tagi dopasowane są dokładnie do słów w tytule tematu, nie pokazuj tagu"
+    company_name: "Nazwa firmy"
+    governing_law: "Obowiązujące prawo"
+    city_for_disputes: "Miasto dyskusji"
     errors:
-      invalid_email: "Nieprawidłowy adres email."
+      invalid_email: "Nieprawidłowy adres e-mail."
       invalid_username: "Użytkownik o takiej nazwie nie istnieje."
       invalid_integer_min_max: "Wartość musi być między %{min} i %{max}."
       invalid_integer_min: "Wartość musi wynosić %{min} albo więcej."
@@ -1681,6 +1692,9 @@ 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_alternative: "Nie możesz znaleźć swojego klucza bezpieczeństwa lub chcesz użyć innej metody?"
+    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."
     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."
@@ -1702,10 +1716,15 @@ pl_PL:
     email_too_long: "Podałeś zbyt długi adres email. Nazwa skrzynki pocztowej nie może być dłuższa niż 254 znaki, a nazwa domeny nie może zawierać więcej niż 253 znaki."
     reserved_username: "Niedozwolona nazwa użytkownika."
     missing_user_field: "Nie wypełniłeś wszystkich pól użytkownika"
+    auth_complete: "Uwierzytelnianie zostało zakończone."
     click_to_continue: "Kliknij tutaj aby kontynuować."
     already_logged_in: "Próbujesz zaakceptować zaproszenie przeznaczone dla innego użytkownika. Jeśli %{current_user} to nie ty, wyloguj się i zaloguj ponownie."
     second_factor_title: "Dwuskładnikowe uwierzytelnianie"
     second_factor_backup_description: "Proszę wprowadź jeden ze swoich zapasowych kodów:"
+    second_factor_backup_title: "Kod zapasowy weryfikacji dwuskładnikowej"
+    second_factor_toggle:
+      totp: "Zamiast tego użyj aplikacji uwierzytelniającej"
+      backup_code: "Zamiast tego użyj kodu zapasowego"
   admin:
     email:
       sent_test: "wysłany!"
@@ -1749,8 +1768,10 @@ pl_PL:
     title: "Niestandardowe zaproszenie mailera"
   invite_forum_mailer:
     title: "Zaproś forum mailera"
+    subject_template: "%{inviter_name}zaprosił cię do dołączenia do%{site_domain_name}"
   custom_invite_forum_mailer:
     title: "Niestandardowe zaproszenie forum mailera"
+    subject_template: "%{inviter_name}zaprosił cię do dołączenia do%{site_domain_name}"
   invite_password_instructions:
     title: "Zaproś hasło instrukcje"
     subject_template: "Ustaw hasło dla swojego konta na %{site_name}"
@@ -1776,10 +1797,6 @@ pl_PL:
   admin_confirmation_mailer:
     title: "Potwierdzenie admina"
     subject_template: "[%{email_prefix}] Potwierdź nowe konto admina"
-    text_body_template: |
-      Proszę potwierdzić dodanie **%{target_username}** jako administratora do twojego forum.
-
-      [Potwierdź Konto Administratora](%{admin_confirm_url})
   test_mailer:
     title: "Test Powiadomień"
     subject_template: "[%{site_name}] Test dostarczania poczty"
@@ -2043,6 +2060,11 @@ pl_PL:
       subject_template: "Jesteś nowym użytkownikiem miesiąca!"
     queued_posts_reminder:
       title: "Przypomnienie o postach w kolejce"
+      subject_template:
+        one: "%{count}wpis czeka na przejrzenie"
+        few: "%{count}wpisy czekają na przejrzenie"
+        many: "%{count}wpisów czeka na przejrzenie;"
+        other: "%{count}wpisów czeka na przejrzenie"
   unsubscribe_link: |
     Aby zrezygnować z otrzymywania tych wiadomości e-mail, [Kliknij tutaj](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2053,6 +2075,7 @@ pl_PL:
     Aby zrezygnować z tych maili, [naciśnij tutaj](%{unsubscribe_url}).
   subject_re: "Re: "
   subject_pm: "[PW] "
+  email_from: "%{user_name}z%{site_name}"
   user_notifications:
     previous_discussion: "Poprzednie odpowiedzi"
     in_reply_to: "W odpowiedzi do"
@@ -2061,27 +2084,10 @@ pl_PL:
       description: "Nie chcesz otrzymywać tych emaili? Nie ma problemu! Kliknij poniżej by wypisać się natychmiast:"
     reply_by_email: "[Zobacz Temat](%{base_url}%{url}) lub odpowiedz na ten email aby odpowiedzieć"
     only_reply_by_email: "Powtórz ten email dla odpowiedzi."
+    only_reply_by_email_pm: "Odpowiedz na tego e‐maila, by odpowiedzieć %{participants}."
     visit_link_to_respond: "[Zobacz Temat](%{base_url}%{url}) aby odpowiedzieć."
     posted_by: "Dodany przez %{username} w dniu %{post_date}"
-    invited_to_private_message_body: |
-      %{username} zaprosił cię do wiadomści
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} zaprosił cię do dyskusji
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w
-
-      > %{site_title} -- %{site_description}
+    pm_participants: "Uczestnicy: %{participants}"
     user_invited_to_private_message_pm_group:
       title: "Użytkownik zaproszony grupy do PM"
       subject_template: "[%{email_prefix}]%{username} zaprosił @%{group_name} do wiadomości '%{topic_title}'"
@@ -2174,6 +2180,7 @@ pl_PL:
 
         %{respond_instructions}
     user_mentioned_pm:
+      title: "Użytkownik wspomniał PW"
       subject_template: "[%{site_name}] [PW] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2233,6 +2240,15 @@ pl_PL:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Konto zawieszone"
+    account_silenced:
+      title: "Konto uciszone"
+    account_exists:
+      title: "Konto już istnieje"
+      subject_template: "[%{email_prefix}] Konto już istnieje"
+    account_second_factor_disabled:
+      title: "Logowanie dwuskładnikowe wyłączone"
     digest:
       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"
@@ -2247,6 +2263,7 @@ pl_PL:
       popular_posts: "Popularne wpisy"
       more_new: "Nowe dla ciebie"
       subject_template: "[%{email_prefix}] Podsumowanie"
+      your_email_settings: "twoje ustawienia e‐mail"
       click_here: "kliknij tutaj"
       from: "%{site_name} podsumowanie"
       preheader: "Podsumowanie aktywności od Twojej ostatniej wizyty w dniu %{last_seen_at}"
@@ -2260,6 +2277,8 @@ pl_PL:
 
         Kliknij na poniższy link by wybrać nowe hasło:
         %{base_url}/users/password-reset/%{email_token}
+    email_login:
+      title: "Zaloguj za pomocą linku"
     set_password:
       title: "Ustaw hasło"
       subject_template: "[%{site_name}] Ustaw hasło"
@@ -2326,6 +2345,8 @@ pl_PL:
         %{base_url}/u/activate-account/%{email_token}
 
         Jeśli powyższy link nie działa, spróbuj skopiować i wkleić go do pasku adresu Twojej przeglądarki.
+    activation_reminder:
+      title: "Przypomnienie o aktywacji"
   page_not_found:
     title: "Ups! Ta strona nie istnieje lub jest prywatna."
     popular_topics: "Popularne"
@@ -2333,6 +2354,8 @@ pl_PL:
     see_more: "Więcej"
     search_title: "Szukaj w serwisie"
     search_button: "Wyszukaj"
+  offline:
+    title: "Nie można załadować aplikacji"
   login_required:
     welcome_message: |
       #[Witamy na %{title}](#welcome)
@@ -2356,7 +2379,6 @@ pl_PL:
     missing: "Przepraszamy, nie możemy odnaleźć żadnego avatara przypisanego do tego konta email. Spróbuj załadować go ponownie"
   flag_reason:
     sockpuppet: "Nowy użytkownik stworzył temat, a inny nowy użytkownik z tym samym adresem IP (%{ip_address}) odpowiedział. <a href='%{base_path}/admin/site_settings/category/spam'>'flag_sockpuppets'</a> ustawienia strony."
-    spam_hosts: "Ten nowy użytkownik próbował stworzyć wiele postów z linkami do tej samej domeny. Zobacz <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold</a> ustawienia strony."
   skipped_email_log:
     exceeded_emails_limit: "Przekroczono maksymalną, dzienną liczbę emaili dla użytkownika"
     exceeded_bounces_limit: "Przekroczono bounce_score_threshold "
@@ -2376,13 +2398,17 @@ pl_PL:
     sender_message_to_blank: "wiadomość.do jest pusta"
     sender_text_part_body_blank: "text_part.body jest pusta"
     sender_body_blank: "Wiadomość jest pusta"
+    sender_post_deleted: "wpis został usunięty"
+    sender_message_to_invalid: "odbiorca ma nieprawidłowy adres e‐mail"
   color_schemes:
     base_theme_name: "Podstawa"
     light: "Jasny"
     dark: "Ciemny"
+    neutral: "Neutralne"
     default_theme_name: "Jasny"
     light_theme_name: "Jasny"
     dark_theme_name: "Ciemny"
+    neutral_theme_name: "Neutralne"
   edit_this_page: "Edytuj tę stronę"
   csv_export:
     boolean_yes: "Tak"
@@ -2788,6 +2814,7 @@ pl_PL:
     only_official: "Wyłącz nieoficjalne wtyczki"
     no_plugins: "Wyłącz wszystkie wtyczki"
     enter: "Włącz Tryb Bezpieczny"
+    must_select: "Musisz wybrać przynajmniej jedną opcję, by wejść do trybu bezpiecznego."
   wizard:
     title: "Instalacja Discourse"
     step:
@@ -2806,6 +2833,9 @@ pl_PL:
           site_description:
             label: "Opisz swoja społeczność w jednym krótkim zdaniu."
             placeholder: "Miejsce dla Jane i jej przyjaciół na dyskusje o fajnych sprawach."
+          short_site_description:
+            label: "Opisz swoją społeczność w paru słowach"
+            placeholder: "Najlepsza społeczność kiedykolwiek"
       introduction:
         title: "Wprowadzenie"
         fields:
@@ -2820,8 +2850,19 @@ pl_PL:
             choices:
               open:
                 label: "Publiczne"
+                description: "Wszyscy mają dostęp do społeczności"
               restricted:
                 label: "Prywatne"
+                description: "Tylko zalogowani użytkownicy mają dostęp do społeczności"
+          privacy_options:
+            description: "W jaki sposób użytkownicy rejestrują swoje konta?"
+            choices:
+              open:
+                label: "Użytkownicy mogą rejestrować się samodzielnie."
+              invite_only:
+                label: "Użytkownicy mogą rejestrować się samodzielnie, ale muszą zostać zaakceptowani przez zespół."
+              must_approve:
+                label: "Użytkownicy muszą zostać zaproszeni przez zaufanych użytkowników lub członków zespołu, zanim będą mogli się zarejestrować."
       contact:
         title: "Dane kontaktowe"
         fields:
@@ -2831,12 +2872,23 @@ pl_PL:
             description: "Adres email osoby lub grupy odpowiedzialnej za tą społeczność. Używany dla krytycznych powiadomień jak na przykład nieobsłużone oflagowania, aktualizację bezpieczeństwa i na <a href='%{base_path}/about' target='_blank'>stronie o Tobie</a> dla szybkiego kontaktu."
           contact_url:
             label: "Strona kontaktowa"
+            placeholder: "https://www.example.com/contact-us"
             description: "Ogólna strona kontaktowa do ciebie i twojej organizacja. Będzie wyświetlane na <a href='%{base_path}/about' target='_blank'>twojej stronie </a>."
           site_contact:
             label: "Automatyczne wiadomości"
             description: "Wszystkie automatyczne wiadomości prywatne Discourse będą wysyłane z tego użytkownika, jak na przykład ostrzeżenia o flagach i powiadomienia ukończenia backupu."
       corporate:
         title: "Organizacja"
+        fields:
+          company_name:
+            label: "Nazwa firmy"
+            placeholder: "Przykładowa organizacja"
+          governing_law:
+            label: "Obowiązujące prawo"
+            placeholder: "Prawo kalifornijskie"
+          city_for_disputes:
+            label: "Miasto dyskusji"
+            placeholder: "Kalifornia, San Francisco"
       colors:
         title: "Motyw"
       themes_further_reading:
@@ -2846,6 +2898,8 @@ pl_PL:
         fields:
           logo:
             label: "Podstawowe logo"
+          logo_small:
+            label: "Kwadratowe logo"
       icons:
         title: "Ikony"
         fields:
@@ -2876,13 +2930,23 @@ pl_PL:
       finished:
         title: "Twój Discourse jest Gotowy!"
   joined: "Dołączył"
+  discourse_push_notifications:
+    popup:
+      confirm_title: "Powiadomienia włączone - %{site_title}"
+      confirm_body: "Powodzenie! Powiadomienia zostały włączone."
   reviewables:
     priorities:
+      low: "Niski"
       medium: "Średni"
       high: "Wysoki"
     sensitivity:
+      disabled: "Wyłączony"
+      low: "Niski"
       medium: "Średni"
       high: "Wysoki"
+    must_claim: "Musisz przejąć tę pozycję, zanim zaczniesz na niej działać."
+    user_claimed: "Inny użytkownik już przejął tę pozycję."
+    missing_version: "Musisz wprowadzić parametr wersji"
     actions:
       agree_and_keep:
         title: "Zachowaj wpis"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 703522e759..2bd5e7075f 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -91,7 +91,6 @@ pt:
         from_reply_by_address_error: "Acontece quando o valor do cabeçalho From coincide com o endereço de e-mail de resposta."
         inactive_user_error: "Acontece quando o remetente não está ativo."
         silenced_user_error: "Acontece quando o remetente foi silenciado."
-        bad_destination_address: "Acontece quando nenhum dos endereços de e-mail nos campos Para/Cc/Bcc coincidem com um endereço de e-mail de 'A Receber' configurado."
         strangers_not_allowed_error: "Acontece quando um utilizador tentou criar um novo tópico numa categoria em que não é membro."
         insufficient_trust_level_error: "Acontece quando um utilizador tentou criar um novo tópico numa categoria em que não tem o nível de confiança necessário."
         reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de e-mail diferente de onde a notificação foi enviada."
@@ -511,7 +510,6 @@ pt:
     activated: "Desculpe, esta conta já foi ativada."
     admin_confirm:
       title: "Confirmar Conta de Administrador"
-      description: "Tem a certeza que deseja que o <b>%{target_username}</b> seja um administrador?"
       grant: "Conceder Acesso de Administrador"
       complete: "<b>%{target_username}</b> é agora um administrador."
       back_to: "Voltar para %{title}"
@@ -1159,7 +1157,7 @@ pt:
     embed_post_limit: "Número máximo de mensagens a serem incorporadas."
     embed_username_required: "O nome de utilizador para a criação de tópico é necessário."
     show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos."
-    delete_drafts_older_than_n_days: Eliminar rascunhos mais antigos que (n) days.
+    delete_drafts_older_than_n_days: "Eliminar rascunhos mais antigos que (n) days."
     bootstrap_mode_min_users: "Número mínimo de utilizadores necessários para desactivar o modo de inicialização (coloque 0 para desactivar)"
     prevent_anons_from_downloading_files: "Previna que utilizadores anónimos descarreguem anexos. AVISO: isto irá fazer com que quaisquer atributos (que não sejam imagens) publicados como anexos não funcionem."
     slug_generation_method: "Escolha um método de geração slug. 'encoded' irá gerar sequências de caracteres com código percentual. 'none' irá desativar slug por completo."
@@ -1518,26 +1516,6 @@ pt:
     only_reply_by_email: "Responda a este email para responder."
     visit_link_to_respond: "[Visitar Tópico](%{base_url}%{url}) para responder."
     posted_by: "Publicado por %{username} em %{post_date}"
-    invited_to_private_message_body: |
-      %{username} convidou-o para uma mensagem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} convidou-o para uma discussão
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       text_body_template: |2
 
@@ -1732,7 +1710,6 @@ pt:
     missing: "Desculpe, mas não conseguimos encontrar nenhum avatar associado com esse endereço de email. Pode tentar carregá-lo novamente?"
   flag_reason:
     sockpuppet: "Um novo utilizador criou um tópico, no qual um outro novo utilizador com o mesmo IP (%{ip_address}) respondeu. Veja as configurações de <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> nas configurações do sítio."
-    spam_hosts: "Este novo utilizador tentou criar múltiplas publicações com ligações ao mesmo domínio. Verifique as configurações do sítio de <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Excedeu max_emails_per_day_per_user"
     exceeded_bounces_limit: "Ultrapassou bounce_score_threshold"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index d70f59a881..b0829d3a2b 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -91,7 +91,6 @@ pt_BR:
         from_reply_by_address_error: "Acontece quando o cabeçalho De corresponde à resposta por endereço de e-mail."
         inactive_user_error: "Ocorre quando o remetente não está ativo."
         silenced_user_error: "Acontece quando o remetente foi silenciado."
-        bad_destination_address: "Ocorre quando nenhum dos endereços de email nos campos Para/Cc/Cco era correspondente ao endereço de email recebido."
         strangers_not_allowed_error: "Ocorre quando um usuário tentou criar um novo tópico em uma categoria da qual não é membro."
         insufficient_trust_level_error: "Ocorre quando um usuário tenta criar um novo tópico em uma categoria onde não possui nível de confiança necessário."
         reply_user_not_matching_error: "Ocorre quando uma resposta chega em um endereço de email diferente ao da notificação enviada."
@@ -717,7 +716,6 @@ pt_BR:
     activated: "Desculpe, esta conta já foi ativada."
     admin_confirm:
       title: "Confirmar Conta de Administrador"
-      description: "Tem certeza de que quer <b>%{target_username}</b> ser um administrador?"
       grant: "Conceder acesso de administrador"
       complete: "<b>%{target_username}</b> é agora um administrador."
       back_to: "Retornar para %{title}"
@@ -1719,7 +1717,7 @@ pt_BR:
     embed_username_required: "Nome de usuário para criação do tópico é obrigatório."
     notify_about_flags_after: "Se houver bandeiras que não foram tratadas depois de muitas horas, envie uma mensagem pessoal para os moderadores. Defina como 0 para desativar."
     show_create_topics_notice: "Se o site tem menos de 5 tópicos públicos, mostrar um aviso pedindo para os administradores criarem alguns tópicos."
-    delete_drafts_older_than_n_days: Apagar rascunhos mais antigos do que (N) dias.
+    delete_drafts_older_than_n_days: "Apagar rascunhos mais antigos do que (N) dias."
     bootstrap_mode_min_users: "Número mínimo de usuários necessários para desativar o modo de bootstrap (definido como 0 para desativado)"
     prevent_anons_from_downloading_files: "Impedir que usuários anônimos façam download de arquivos anexados. AVISO: isso irá impedir quaisquer componentes do site que não sejam imagens, tendo sido postados como anexos, de funcionar."
     slug_generation_method: "Escolha um método para geração de slug. 'Codificado' irá gerar strings com '%'. 'Nenhum' irá desabilitar a geração de slugs."
@@ -2115,10 +2113,6 @@ pt_BR:
   admin_confirmation_mailer:
     title: "Confirmação do administrador"
     subject_template: "[%{email_prefix}] Confirmar nova conta de administrador"
-    text_body_template: |
-      Por favor, confirme se você gostaria de adicionar **%{target_username}** como um administrador para seu fórum.
-
-      [Confirmar Conta de Administrador](%{admin_confirm_url})
   test_mailer:
     title: "Teste de remetente"
     subject_template: "[%{email_prefix}] Teste de entrega de e-mail"
@@ -2675,36 +2669,6 @@ pt_BR:
     visit_link_to_respond_pm: "[Visite a Mensagem](%{base_url}%{url}) para responder a %{participants}."
     posted_by: "Postado por %{username} em %{post_date}"
     pm_participants: "Participantes: %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} convidou @%{group_name} para uma mensagem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} convidou você para uma mensagem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} te convidou para uma discussão
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Grupo Convidado do Usuário para MP"
       subject_template: "[%{email_prefix}] %{username} convidou @%{group_name} para a mensagem'%{topic_title}'"
@@ -3071,7 +3035,6 @@ pt_BR:
     missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?"
   flag_reason:
     sockpuppet: "Um novo usuário criou um tópico, e um outro novo usuário no mesmo endereço IP (%{ip_address}) respondeu. Veja a configuração <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> do site."
-    spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio. Veja a configuração <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> do site."
   skipped_email_log:
     exceeded_emails_limit: "Excedido max_emails_per_day_per_user"
     exceeded_bounces_limit: "Excedido bounce_score_threshold"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 141e5150a6..8f3ed1b9de 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -45,7 +45,6 @@ ro:
         auto_generated_email_error: "Apare când header-ul de 'precedență' este setat pe: list, junk, bulk sau auto_reply, sau atunci când orice alt header conține: auto-submitted, auto-replied sau auto-generated."
         no_body_detected_error: "Apare când nu am putut extrage corpul mesajului și nu existau fișiere atașate."
         inactive_user_error: "Apare când expeditorul nu este activ."
-        bad_destination_address: "Apare când niciuna dintre adresele de email din câmpurile To/Cc/Bcc nu se potrivește cu o adresa de email expeditor configurată."
         strangers_not_allowed_error: "Apare când un utilizator a încercat să creeze un nou subiect într-o categorie în care nu este membru. "
         insufficient_trust_level_error: "Apare atunci când un utilizator a încercat să creeze un subiect nou într-o categorie pentru care nu are nivelul de încredere necesar."
         reply_user_not_matching_error: "Apare atunci când un răspuns a venit de la o adresă de email diferită de cea la care a fost trimisă notificarea."
@@ -471,7 +470,6 @@ ro:
     activated: "Acest cont a fost deja activat."
     admin_confirm:
       title: "Confirmă contul de Administrator"
-      description: "Eșți sigur că vrei ca <b>%{target_username}</b> să fie administrator?"
       grant: "Acordă titlu de admin"
       complete: "<b>%{target_username}</b> este administrator."
       back_to: "Întoarce-te la %{title}"
@@ -1117,7 +1115,7 @@ ro:
     embed_post_limit: "Numărul maxim de postări care să fie încorporate."
     embed_username_required: "Numele utilizator pentru acest subiect este obligatoriu."
     show_create_topics_notice: "Dacă site-ul are mai puțin de 5 subiecte publice, afișează o notificare prin care se cere adminilor să creeze subiecte."
-    delete_drafts_older_than_n_days: șterge drafturile mai vechi de (n) zile.
+    delete_drafts_older_than_n_days: "șterge drafturile mai vechi de (n) zile."
     bootstrap_mode_min_users: "Numărul minim de utilizatori necesar pentru dezactivarea modului bootstrap (0 pentru dezactivare)"
     prevent_anons_from_downloading_files: "Blochează utilizatorii anonimi de la descărcarea de atașamente. ATENȚIE: aceasta va face ca toate resursele site-ului care sunt postate ca atașamente să nu mai meargă."
     slug_generation_method: "Alege o metodă de generare de identificator. 'encodat' va genera șir de caractere encodate cu procentaje. 'nimic' va dezactiva complet identificatorii."
@@ -1459,26 +1457,6 @@ ro:
     only_reply_by_email: "Dă reply la acest email pentru a răspunde."
     visit_link_to_respond: "[Vizitează subiect](%{base_url}%{url}) pentru a răspunde."
     posted_by: "Postat de %{username} pe data %{post_date}"
-    invited_to_private_message_body: |
-      %{username} te-a invitat la un mesaj
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      pe
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} te-a invitat la o discuție
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      pe
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       text_body_template: |
         %{header_instructions}
@@ -1659,7 +1637,6 @@ ro:
     missing: "Ne pare rău, dar nu putem găsi avatarul asociat cu această adresă de email. Ai putea să îl încarci din nou?"
   flag_reason:
     sockpuppet: "Un utilizator nou a creat un subiect, și un alt utilizator nou de la aceeași adresă de IP (%{ip_address}) a răspuns. Vezi <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> la setările site-ului."
-    spam_hosts: "Acest nou utilizator a încrecat să creeze postări multiple cu link-uri către acelasi domeniu. Vezi <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> la setările site-ului."
   skipped_email_log:
     exceeded_emails_limit: "Depășit max_emails_per_day_per_user"
     exceeded_bounces_limit: "Depășit bounce_score_threshold"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index d328125a6d..432daac499 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -91,7 +91,6 @@ ru:
         from_reply_by_address_error: "Происходит, когда заголовок From совпадает с ответом по адресу электронной почты."
         inactive_user_error: "Происходит, когда отправитель неактивен."
         silenced_user_error: "Происходит, когда отправитель заблокирован."
-        bad_destination_address: "Происходит, когда ни один из адресатов, указанных в полях To/Cc/Bcc не совпадает со входящим адресом электронной почты."
         strangers_not_allowed_error: "Происходит когда пользователь пытается создать новую тему в разделе, участником которого он не является."
         insufficient_trust_level_error: "Происходит когда пользователь пытается создать новую тему в категории, недоступной ему по уровню доступа."
         reply_user_not_matching_error: "Происходит, когда ответ приходит с адреса, отличного от того, на который было направлено уведомление."
@@ -767,7 +766,6 @@ ru:
     activated: "Извините, эта учетная запись уже активирована."
     admin_confirm:
       title: "Подтвердите Учетную Запись Администратора"
-      description: "Вы уверены что хотите <b>%{target_username}</b> назначить администратором?"
       grant: "Предоставить Доступ Администратора"
       complete: "<b>%{target_username}</b> сейчас является администратором."
       back_to: "Вернуться к %{title}"
@@ -1851,10 +1849,6 @@ ru:
   admin_confirmation_mailer:
     title: "Подтверждение Администратора"
     subject_template: "[%{email_prefix}] Подтверждение новой Учетной Записи Администратора"
-    text_body_template: |
-      Пожалуйста, подтвердите, что вы хотите добавить **%{target_username}** администратором вашего форума.
-
-      [Подтверждение Учетной Записи Администратора](%{admin_confirm_url})
   test_mailer:
     subject_template: "[%{email_prefix}] Проверка доставки по e-mail почте"
   new_version_mailer:
@@ -2292,7 +2286,6 @@ ru:
     missing: "К сожалению, нам не удалось найти ни одного аватара, связанного с этим электронным адресом. Попытаетесь загрузить аватар снова?"
   flag_reason:
     sockpuppet: "Новый пользователь создал тему, а другой новый пользователь ответил с этого же IP адреса (%{ip_address}). Смотрите параметр <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> сайта."
-    spam_hosts: "Этот новый пользователь пытался создать множество сообщений с ссылками на один и тот же домен. Смотрите параметр <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> сайта."
   skipped_email_log:
     exceeded_emails_limit: "Превышен max_emails_per_day_per_user"
     exceeded_bounces_limit: "Превышен bounce_score_threshold"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index a9b47dfdf3..b4e4fb0bf1 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -1028,7 +1028,7 @@ sk:
     embed_post_limit: "Maximálny počet príspevkov na vloženie."
     embed_username_required: "Na vytvorenie téme je vyžadované používateľské meno."
     show_create_topics_notice: "Zobraz výzvu žiadajúcu administrátorov o vytvorenie nejakých tém, ak majú stránky menej ako 5 verejných tém."
-    delete_drafts_older_than_n_days: Vymazať návrhy staršie ako (n) dní.
+    delete_drafts_older_than_n_days: "Vymazať návrhy staršie ako (n) dní."
     prevent_anons_from_downloading_files: "Zabrániť anonymným používateľom sťahovať prílohy. VAROVANIE: toto nastavenie zneprístupní akékoľvek neobrázkové súbory na stánkach uložené ako prílohy."
     slug_generation_method: "Vybrať metódu generovania koncovej časti adresy. 'encoded' vygeneruje percentami zakódovaní reťazec. 'none' vypne koncovú časť adresy úplne."
     enable_emoji: "Zapnúť emoji"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 41a036709b..6a5711a141 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -1035,9 +1035,9 @@ sl:
       title: "Varnostna kopija uspela"
       subject_template: "Varnostna kopija uspela"
       text_body_template: |
-        Varnostna kopija uspela.
+        Varnostna kopija uspešno narejena.
 
-        Pojdite v [admin > backup section](%{base_url}/admin/backups) za prenos vaše nove varnostne kopije.
+        Pojdite v [Admin > Varnostne kopije](%{base_url}/admin/backups) za prenos vaše nove varnostne kopije.
 
         Tukaj je dnevnik:
 
@@ -1401,36 +1401,6 @@ sl:
     visit_link_to_respond_pm: "[Pojdi na sporočilo](%{base_url}%{url}) za odgovor %{participants}."
     posted_by: "Objavljeno od %{username}ob %{post_date}"
     pm_participants: "Sodelujoči: %{participants}"
-    invited_group_to_private_message_body: |
-      %{username} je povabil @%{group_name} da sodeluje v
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      na
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} vas je povabil da sodelujete v
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      na
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} vas je povabil da sodelujete v
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      na
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Uporabnik je povabil skupino v ZS"
       subject_template: "[%{email_prefix}] %{username} je povabil @%{group_name} da sodelujete v '%{topic_title}'"
@@ -1782,7 +1752,6 @@ sl:
     edit_reason: "prenos slik v lokalno kopijo"
   flag_reason:
     sockpuppet: "Nov uporabnik je ustvaril temo in drugi novi uporabnik z enakim IP naslovom (%{ip_address}) je odgovoril. Preverite <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> nastavitev strani."
-    spam_hosts: "Ta novi uporabnik je poskusil ustvariti več prispevkov z povezavami na enako domeno. Preverite <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> nastavitev strani."
   edit_this_page: "Uredi to stran"
   csv_export:
     boolean_yes: "Da"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index b2aee742ce..6130e9b8ad 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -834,7 +834,7 @@ sq:
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Maximum number of posts to embed."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
-    delete_drafts_older_than_n_days: Delete drafts older than (n) days.
+    delete_drafts_older_than_n_days: "Delete drafts older than (n) days."
     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."
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
     enable_emoji: "Enable emoji"
@@ -933,11 +933,6 @@ sq:
       max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member."
   invite_password_instructions:
     subject_template: "Vendos fjalëkalimin për llogarinë tek %{site_name}"
-  admin_confirmation_mailer:
-    text_body_template: |
-      Ju lutemi të konfirmoni që dëshironi të shtoni **%{target_username}** si një administrator në këtë faqe.
-
-      [Konfirmo llogarinë e administratorit](%{admin_confirm_url})
   flag_reasons:
     off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post."
     inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](%{base_path}/guidelines)."
@@ -1026,26 +1021,6 @@ sq:
     only_reply_by_email: "Përgjigjju këtij email-i për të vazhduar."
     visit_link_to_respond: "[Shiko Temën](%{base_url}%{url}) për tu përgjigjur."
     posted_by: "Postuar nga %{username} më %{post_date}"
-    invited_to_private_message_body: |
-      %{username} ju ftoi tek mesazhi
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      në
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} ju ftoi në një bisedë
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tek
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       text_body_template: |
         %{header_instructions}
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index d1a80d9a79..0841a18caf 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -258,7 +258,7 @@ sr:
     autohighlight_all_code: "Forsiraj primenu označavanja koda za sve preformatirane blokove koda i kada nije eksplicitno naveden jezik."
     embed_username_required: "Korisničko ime je obavezno za kreiranje teme."
     show_create_topics_notice: "Ako sajt ima manje od 5 javnih tema, prikaži poruku koja sugeriše administratorima da kreiraju neke teme."
-    delete_drafts_older_than_n_days: Izbriši radne verzije poruka starije od (n) dana
+    delete_drafts_older_than_n_days: "Izbriši radne verzije poruka starije od (n) dana"
     enable_emoji: "Omogući emotikone"
     emoji_set: "Koliko bi ste želeli vas emoji?"
     auto_close_messages_post_count: "Maksimalan broj dozvoljenih poruka pre nego se tema automatski zatvori (0 da se isključi)"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 4d1a95b9ec..cb7156fc47 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -45,7 +45,6 @@ sv:
         auto_generated_email_error: "Händer när 'precedence'-rubriken är satt till: list, skräp, mass eller auto-reply, eller när någon annan rubrik innehåller: auto-submitted, auto-replied eller auto-generated."
         no_body_detected_error: "Händer när vi inte kunde extrahera någon huvuddel och det inte fanns några bilagor."
         inactive_user_error: "Händer när sändaren inte är aktiv."
-        bad_destination_address: "Händer när inga av e-postadresserna i Till/Cc/Bcc-fälten matchar en konfigurerad inkommande e-postadress."
         strangers_not_allowed_error: "Händer när en användare försöker skapa ett nytt ämne i en kategori som användare inte är en medlem av."
         insufficient_trust_level_error: "Händer när en användare försöker skapa ett nytt ämne i en kategori som användare saknar förtroendenivå för."
         reply_user_not_matching_error: "Händer när ett svar kommer in från en annan e-postadress än den notificieringen skickades till."
@@ -1050,7 +1049,7 @@ sv:
     embed_post_limit: "Högsta antal inlägg att bädda in."
     embed_username_required: "Användarnamn krävs för skapade av ämne."
     show_create_topics_notice: "Visa en notis som ber administratörerna att skapa några ämnen om webbplatsen har färre än 5 publika ämnen."
-    delete_drafts_older_than_n_days: Ta bort utkast som är äldre än (n) dagar.
+    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."
     slug_generation_method: "Välj en genereringsmetod för etiketter. Ange 'none' för att inaktivera generering av etiketter. "
@@ -1388,17 +1387,6 @@ sv:
     only_reply_by_email: "Besvara det här e-postmeddelandet för att ge din respons. "
     visit_link_to_respond: "[Besök ämnet](%{base_url}%{url}) för att ge din respons. "
     posted_by: "Postat av %{username} den %{post_date}"
-    invited_to_private_message_body: "%{username} bjöd in dit till ett meddelande\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nvid \n\n> %{site_title} -- %{site_description}\n"
-    invited_to_topic_body: |
-      %{username} bjöd in dig till en diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      vid
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       text_body_template: |
         %{header_instructions}
@@ -1604,7 +1592,6 @@ sv:
     missing: "Tyvärr, vi kunde inte hitta någon avatar associerad med den e-postadressen. Kan du försöka ladda upp den igen?"
   flag_reason:
     sockpuppet: "En ny användare skapade ett ämne, och en annan ny användare på samma IP-adress (%{ip_address}) svarade. Granska webbplatsinställningen <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Den här nya användaren försökte skapa flera inlägg med länkar till samma domän. Granska webbplatsinställningen <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Översteg max_emails_per_day_per_user"
     exceeded_bounces_limit: "Översteg bounce_score_threshold"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index ea688c5c82..eda4995399 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -66,7 +66,6 @@ sw:
         no_sender_detected_error: "Inatokea tukishindwa kupata barua pepe halali kutoka kwenye sehemu uliyoandika barua pepe."
         inactive_user_error: "Inatokea kama mtumiaji hayuko hewani."
         silenced_user_error: "Inatokea mtumaji akiwa amenyamazishwa."
-        bad_destination_address: "Inatokea kama hakuna barua pepe kwenye nafasi za Kwenda/Cc/Bcc haziendani na barua pepe inayoingia."
         strangers_not_allowed_error: "Inatokea wakati mtumiaji akijaribu kutengeneza mada mpya ndani ya kategoria ambayo sio mwanyamachama."
         insufficient_trust_level_error: "Inatokea wakati mtumiaji akijaribu kutengeneza mada mpya ndani ya kategoria ambacho hana kiwango cha uaminifu."
         reply_user_not_matching_error: "Inatokea kama jibu limetoka kwenye barua pepe tofauti na barua pepe iliyopokea taarifa."
@@ -424,7 +423,6 @@ sw:
     activated: "Samahani, akaunti hii imeshaanzishwa."
     admin_confirm:
       title: "Thibitisha Akaunti ya Kiongozi"
-      description: "Una uhakika unataka <b>%{target_username}</b>kuwa msimamizi?"
       grant: "Toa ufikivu wa Kiongozi"
       complete: "<b>%{target_username}</b>ni msimamizi."
       back_to: "Rudi kwenye %{title}"
@@ -924,7 +922,7 @@ sw:
     embed_post_limit: "Kiwango cha juu cha machapisho yakuambatanisha."
     embed_username_required: "Jina la mtumiaji kwa ajili ya kutengeneza mada linahitajika."
     show_create_topics_notice: "Kama tovuti ina machapisho chini ya 5, onyesha notisi kuwaambia viongozi kutengeneza mada mpya."
-    delete_drafts_older_than_n_days: Futa mswadajaribio zenye umri zaidi ya siku (n).
+    delete_drafts_older_than_n_days: "Futa mswadajaribio zenye umri zaidi ya siku (n)."
     enable_emoji: "Ruhusu ishara"
     emoji_set: "Ungependa ishara yako iwe vipi?"
     approve_post_count: "Namba za machapisho kutoka kwa mtumiaji mpya au wa msingi ambazo lazima zipate kibali"
@@ -1156,10 +1154,6 @@ sw:
   admin_confirmation_mailer:
     title: "Uthibitisho wa Kiongozi"
     subject_template: "[%{email_prefix}] Thibitisha akaunti mpya ya Kiongozi"
-    text_body_template: |
-      Tafadhali thibitisha kuwa ungependa kumuongeza **%{target_username}** kama msimazi wa jukwaa lako.
-
-      [Thibitisha Akaunti ya Msimamizi](%{admin_confirm_url})
   test_mailer:
     subject_template: "[%{email_prefix}] Majaribio ya Kuwasilisha Barua Pepe"
   new_version_mailer_with_notes:
@@ -1472,34 +1466,6 @@ sw:
     only_reply_by_email: "Jibu barua pepe hii kutoa maoni."
     visit_link_to_respond: "[Tembelea Mada](%{base_url}%{url}) kutoa maoni."
     posted_by: "Imeandikwa na %{username}tarehe %{post_date}"
-    invited_group_to_private_message_body: |
-      %{username} amekaribishwa @%{group_name} kwenye ujumbe
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      kwenye
-
-      > %{site_title} -- %{site_description}
-    invited_to_private_message_body: |
-      %{username} amekukaribisha kwenye ujumbe
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      kwenye
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} amekukaribisha kwenye majadiliano
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      kwenye
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "Mtumiaji Amekaribishwa kwenye PM"
       subject_template: "[%{email_prefix}] %{username} amemkaribisha @%{group_name} kwenye ujumbe '%{topic_title}'"
@@ -1846,7 +1812,6 @@ sw:
     missing: "Samahani, tumeshindwa kuona picha inayoendana na barua pepe hiyo. Unaweza kuipakia tena?"
   flag_reason:
     sockpuppet: "Mtumiaji mpya ametengeneza mada, na mtumiaji mpya mwenye anwani ya mtandao hiyo hiyo (%{ip_address}) amejibu. Angalia mpangilio wa tovuti <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Mtumiaji mpya amejaribu kutengeneza machapisho mengi yenye viungo kwenda kwa kikoa. Tembelea <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> mpangilio wa tovuti."
   skipped_email_log:
     exceeded_emails_limit: "Kiwango kimepita max_emails_per_day_per_user"
     exceeded_bounces_limit: "Kiwango kimepita bounce_score_threshold"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index a22ee706f7..8e1355ae12 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -972,7 +972,7 @@ tr_TR:
     embed_post_limit: "Yerleştirilecek en fazla gönderi sayısı."
     embed_username_required: "Konu oluşturmak için kullanıcı adı gereklidir."
     show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, yöneticiden yeni konular oluşturmasını isteyen bir uyarı iletisi göster. "
-    delete_drafts_older_than_n_days: (n) günden eski taslakları sil.
+    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."
     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."
@@ -1225,26 +1225,6 @@ tr_TR:
     only_reply_by_email: "Cevap vermek için bu e-postayı cevaplayın."
     visit_link_to_respond: "Cevaplamak için [konuyu ziyaret edin](%{base_url}%{url})."
     posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi"
-    invited_to_private_message_body: |
-      %{username} sizi bir iletiye davet etti
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      şurada
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} sizi bir tartışmaya davet etti
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      şurada
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
       text_body_template: |
         %{header_instructions}
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index a2ea1f2a27..0497004728 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -14,64 +14,274 @@ uk:
     formats:
       short: "%m-%d-%Y"
       short_no_year: "%B %-d"
+      date_only: "%m-%d-%Y"
+      long: "%d.%m.%Y %H:%M:%S"
+      no_day: "%B %Y"
   date:
-    month_names: [~, "", "", "", "", "", "", "", "", "", "", "", ""]
+    month_names: [~, Січень, Лютий, Березень, Квітень, Травень, Червень, Липень, Серпень, Вересень, Жовтень, Листопад, Грудень]
     <<: *datetime_formats
   time:
     <<: *datetime_formats
+    am: "до полудня"
+    pm: "после полудня"
   title: "Discourse"
   topics: "Теми"
   posts: "дописи"
   loading: "Завантаження"
+  powered_by_html: 'При підтримці <a href="http://www.discourse.org">Discourse</a>, краще за все використовувати з увімкненим JavaScript'
   sign_up: "Зареєструватись"
   log_in: "Вхід"
   submit: "Надіслати"
+  purge_reason: "Обліковий запис видалений автоматично як покинутий та неактивований."
+  disable_remote_images_download_reason: "Завантаження картинок було відключено через нестачу місця на диску."
+  anonymous: "Анонімний"
+  remove_posts_deleted_by_author: "Видалено автором"
+  redirect_warning: "Нам не вдалося переконатися, що обране вами посилання дійсно було розміщено на форумі. Якщо ви хочете продовжити, виберіть посилання нижче."
+  on_another_topic: "На іншу тему"
+  themes:
+    bad_color_scheme: "Неможливо оновити тему, недійсна палітра кольорів"
+    other_error: "Щось пішло не так з оновленням теми"
+    compile_error:
+      unrecognized_extension: "Нерозпізнане розширення файлу: %{extension}"
+    import_error:
+      generic: Виникла помилка при імпорті цієї теми
+      about_json: "Помилка імпорта: about.json не існує або є недійсним"
+      about_json_values: "about.json має неприпустимі значення: %{errors}"
+      git: "Помилка клонування git репозиторія, доступ заборонено або репозиторій не знайдено"
+      unpack_failed: "Не вдалось розпакувати файл"
+      file_too_big: "Нестиснений файл занадто великий."
+      unknown_file_type: "Завантажений файл не є допустимою темою для Discourse."
+    errors:
+      component_no_user_selectable: "Компоненти не можуть бути вибраними користувачами"
+      component_no_default: "Компоненти теми не можуть бути темою за замовчуванням"
+      component_no_color_scheme: "Компоненти теми не можуть мати колірні палітри"
+      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}` за замовчуванням, не збігається з типом параметра."
+      default_out_range: "Налаштування `%{name}` не перебуває у зазначеному діапазоні."
+      enum_value_not_valid: "Вибране значення не є одним з варіантів перерахування."
+      number_value_not_valid: "Нове значення поза межами дозволеного діапазону."
+      number_value_not_valid_min_max: "Він повинен бути між %{min} та %{max}."
+      number_value_not_valid_min: "Він повинен бути більшим або рівним %{min}."
+      number_value_not_valid_max: "Він повинен бути меншим або рівним %{max}."
+      string_value_not_valid: "Нова довжина значення поза межами дозволеного діапазону."
+      string_value_not_valid_min_max: "Він повинен бути між символами %{min} та %{max}."
+      string_value_not_valid_min: "Він повинен бути принаймні з %{min} символів."
+      string_value_not_valid_max: "Він повинен бути не більше %{max} символів."
+    locale_errors:
+      top_level_locale: "Ключ верхнього рівня в файлі локалі повинен відповідати імені локалі"
+      invalid_yaml: "Переклад YAML недійсний"
   emails:
     incoming:
+      default_subject: "Потрібно заповнити заголовок теми"
+      show_trimmed_content: "Показати обрізаний вміст"
+      maximum_staged_user_per_email_reached: "Досягнуто максимальної кількості створених користувачів на одну email."
+      no_subject: "(без теми)"
+      no_body: "(без тіла повідомлення)"
+      missing_attachment: "(Вкладення %{filename} недоступне)"
       errors:
+        empty_email_error: "Відбувається, коли ми отримуємо порожній лист."
+        no_message_id_error: "Відбувається, коли лист не має заголовка 'Message-Id'."
+        auto_generated_email_error: "Відбувається коли заголовок \"пріоритет\" встановлений в: 'bulk', 'list', 'auto_reply', 'junk' або коли інший заголовок містить прапори 'auto-submitted', 'auto-replied' або 'auto-generated'."
+        no_body_detected_error: "Трапляється, коли ми не змогли витягти текст листа і не було ніяких вкладень."
+        no_sender_detected_error: "Відбувається, коли ми не можемо знайти дійсний Email адреса в заголовку From."
+        from_reply_by_address_error: "Відбувається, коли заголовок From збігається з відповіддю на адресу електронної пошти."
         inactive_user_error: "Таке трапляється, якщо відправник не активний"
+        silenced_user_error: "Відбувається, коли відправник заблокований."
+        bad_destination_address: "Трапляється, коли жодна з електронних адрес у полях To / Cc не відповідає налаштуванням вхідної електронної адреси."
+        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: "Буває, коли відписка через електронну пошту не дозволена для цього користувача."
+        email_not_allowed: "Буває, коли адреса електронної пошти відсутня в білому або чорному списку."
+      unrecognized_error: "Невідома помилка"
   errors: &errors
+    format: "%{attribute} %{message}"
+    format_with_full_message: "<b>%{attribute}</b>: %{message}"
     messages:
+      too_long_validation: "не може бути довшим %{max} символів, а введено %{length}."
+      invalid_boolean: "Неправильне логічне значення."
+      taken: "вже прийнято"
       accepted: має бути прийнятий
       blank: не може бути порожнім
       present: має бути порожнім
+      confirmation: "не відповідає %{attribute}"
+      empty: но може бути порожнім
+      equal_to: "повинна дорівнювати %{count}"
+      even: повинно бути парним
       exclusion: is reserved
+      greater_than: "має бути більше %{count}"
+      greater_than_or_equal_to: "має бути більшим або рівним %{count}"
       has_already_been_used: "вже було використано"
+      inclusion: не включено до списку
+      invalid: недійсний
+      is_invalid: "не зовсім зрозуміло, це речення закінчене?"
+      contains_censored_words: "містить такі нецензурні слова: %{censored_words}"
+      less_than: "має бути менше %{count}"
+      less_than_or_equal_to: "має бути меншим або рівним %{count}"
       not_a_number: це не цифра
       not_an_integer: має бути цілим числом
+      odd: повинні бути непарними
+      record_invalid: "Не вдалося перевірити: %{errors}"
+      max_emojis: "не може мати більше %{max_emojis_count}емоцій"
+      emojis_disabled: "не може мати смайли"
+      ip_address_already_screened: "вже включено в існуюче правило"
+      restrict_dependent_destroy:
+        one: "Неможливо видалити запис, оскільки існує залежність %{record}"
+        many: "Неможливо видалити запис, оскільки існує залежна %{record}"
       too_long:
         one: надто довге (максимум %{count} символ)
         few: надто довге (максимум %{count} символів)
         many: надто довге (максимум %{count} символів)
         other: надто довге (максимум %{count} символів)
-      other_than: "має бути іншим ніж %{count}"
+      too_short:
+        one: занадто короткий (мінімум - %{count} символ)
+        few: занадто короткий (мінімум %{count} символів)
+        many: занадто короткий (мінімум %{count} символів)
+        other: занадто короткий (мінімум %{count} символів)
+      wrong_length:
+        one: неправильна довжина (має бути символом %{count})
+        few: неправильна довжина (має містити символи %{count})
+        many: неправильна довжина (має містити символи %{count})
+        other: неправильна довжина (має містити %{count} символи)
+      other_than: "не має бути рівним %{count}"
+      sso_overrides_username: "Ім’я користувача потрібно оновити на стороні постачальника послуг SSO, оскільки налаштування `sso_overrides_username` увімкнено."
     template:
       body: "Проблеми на цих полях:"
+      header:
+        one: "Помилка %{count} забороняє зберігати цю %{model}"
+        few: "Помилки %{count} забороняють зберігати цей %{model}"
+        many: "Помилки %{count} забороняють зберігати цей %{model}"
+        other: "%{count} помилки перешкоджають зберегти ці %{model}"
     embed:
       load_from_remote: "Під час завантаження допису виникла проблема."
+    site_settings:
+      invalid_category_id: "Ви вказали категорію, яка не існує"
+      invalid_choice:
+        one: "Ви вказали недійсний вибір %{name}"
+        few: "Ви вказали недійсні варіанти %{name}"
+        many: "Ви вказали недійсні варіанти %{name}"
+        other: "Ви вказали недійсні варіанти %{name}"
+      default_categories_already_selected: "Ви не можете вибрати категорію, що використовується в іншому списку."
+      default_tags_already_selected: "Ви не можете вибрати тег, який використовується в іншому списку."
+      s3_upload_bucket_is_required: "Ви не можете ввімкнути завантаження на S3, якщо ви не надали &quot;s3_upload_bucket&quot;."
+      enable_s3_uploads_is_required: "Ви не можете включити інвентар до S3, якщо ви не включили завантаження S3."
+      s3_backup_requires_s3_settings: "Ви не можете використовувати S3 як резервне розташування, якщо ви не вказали &quot;%{setting_name}&quot;."
+      s3_bucket_reused: "Не можна використовувати одне й те саме bucket для &#39;s3_upload_bucket&#39; та &#39;s3_backup_bucket&#39;. Виберіть інше bucket або використовуйте інший шлях для кожного bucket."
+    conflicting_google_user_id: 'Ідентифікатор облікового запису Google для цього облікового запису змінився; втручання персоналу потрібно з міркувань безпеки. Будь ласка, зв''яжіться з персоналом і вкажіть <br><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_json: "Ваш маркер запрошення недійсний. Зверніться до персоналу."
+    not_found_template: |
+      <p>Ваше запрошення на <a href="%{base_url}">%{site_name}</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>"
+    confirm_email: "<p>Ви майже закінчили! Ми відправили лист активації на Вашу електронну адресу e-mail пошти. Будь ласка, дотримуйтесь інструкцій в листі, щоб активувати свій акаунт. </p><p> Якщо лист не приходить, перевірте папку зі спамом. </p>"
+  bulk_invite:
+    file_should_be_csv: "Завантажений файл повинен мати формат CSV."
+    max_rows: "Спочатку буде надіслано тільки %{max_bulk_invites} запрошення. Спробуйте розділити файл на менші частини."
+    error: "Під час завантаження цього файлу сталася помилка. Будь-ласка спробуйте пізніше."
+  topic_invite:
+    failed_to_invite: "Користувача не можна запросити в цю тему без членства в одній із наступних груп: %{group_names}."
+    user_exists: "На жаль, цього користувача вже запрошено. Ви можете запросити користувача до теми лише один раз."
   backup:
-    operation_already_running: "An operation is currently running. Can't start a new job right now."
-    backup_file_should_be_tar_gz: "The backup file should be a .tar.gz archive."
-    not_enough_space_on_disk: "There is not enough space on disk to upload this backup."
-  not_logged_in: "You need to be logged in to do that."
-  read_only_mode_enabled: "The site is in read only mode. Interactions are disabled."
-  reading_time: "Час зчитування"
+    operation_already_running: "Наразі виконується операція. Неможливо почати нову роботу зараз."
+    backup_file_should_be_tar_gz: "Файл резервної копії повинен бути архівом .tar.gz."
+    not_enough_space_on_disk: "На диску не вистачає місця для завантаження цієї резервної копії."
+    invalid_filename: "Ім'я файлу резервної копії містить недійсні символи. Дійсні символи - a-z 0-9 .-_."
+    file_exists: "Файл, який ви намагаєтеся завантажити, вже існує."
+    location:
+      local: "Локально"
+      s3: "Amazon S3"
+  invalid_params: "Ви вказали недійсні параметри запиту: %{message}"
+  not_logged_in: "Для цього вам потрібно увійти в систему."
+  not_found: "Не вдалося знайти запитувану URL-адресу чи ресурс."
+  invalid_access: "Вам заборонено переглядати запитуваний ресурс."
+  authenticator_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: "Або шепіт не включений, або у вас немає доступу до створення допису шепоту"
+  not_in_group:
+    title_topic: "Ви повинні бути в групі, щоб переглянути цю тему."
+    title_category: "Ви повинні бути в групі, щоб побачити цю категорію."
+    request_membership: "Попросити членство"
+    join_group: "Приєднатись до групи"
+  deleted_topic: "На жаль! Цю тему видалено і вона більше не доступна."
+  reading_time: "Час читання"
   likes: "Вподобання"
+  too_many_replies:
+    one: "Вибачте, нові користувачі можуть залишати тільки одну відповідь до теми."
+    few: "Вибачте, нові користувачі можуть залишати тільки %{count} відповідей до однієї теми."
+    many: "Вибачте, нові користувачі можуть залишати тільки %{count} відповідей до однієї теми."
+    other: "Вибачте, нові користувачі можуть залишати тільки %{count} відповідь(ей) до однієї теми."
+  max_consecutive_replies:
+    one: "Допускається не більше %{count} послідовну відповідь. Відредагуйте попередню відповідь, або дочекайтесь відповіді. "
+    few: "Допускається не більше %{count} послідовних відповідей. Відредагуйте попередню відповідь, або дочекайтесь відповіді. "
+    many: "Допускається не більше %{count} послідовних відповідей. Відредагуйте попередню відповідь, або дочекайтесь відповіді. "
+    other: "Допускається не більше %{count} послідовних відповідей. Відредагуйте попередню відповідь, або дочекайтесь відповіді. "
   embed:
     start_discussion: "Розпочати Дискусію"
     continue: "Продовжити Дискусію"
+    error: "Внутрішня помилка"
+    referer: "Джерело:"
+    error_topics: "Налаштування сайту `embed topics list` не було ввімкнено"
+    mismatch: "Реферер не був відправлений, або не відповідав жодному з наступних вузлів:"
+    no_hosts: "Ніяких хостів не налаштовано для вбудовування."
+    configure: "Налаштування вставки"
     more_replies:
-      one: "%{count} більше відповідей"
-      few: "%{count} більше відповідей"
-      many: "%{count} більше відповідей"
-      other: "%{count} більше відповідей"
+      one: "Ще %{count} відповідь"
+      few: "Ще %{count} відповіді"
+      many: "Ще %{count} відповідей"
+      other: "Ще %{count} відповідей"
     loading: "Завантаження обговорення..."
     permalink: "Постійне посилання"
-    imported_from: "Discussion topic for the original blog entry at: %{link}"
+    imported_from: "Тема обговорення публікації за адресою: %{link}"
+    in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} відповідь"
+      few: "%{count} відповіді"
+      many: "%{count} відповідей"
+      other: "%{count} відповідь"
+    likes:
+      one: "%{count} подобається"
+      few: "%{count} подобається"
+      many: "%{count} подобається"
+      other: "%{count} вподобань"
+    last_reply: "Остання відповідь"
     created: "Створено"
+    new_topic: "Створіть нову тему"
+  no_mentions_allowed: "На жаль, ви не можете згадувати інших користувачів."
+  too_many_mentions:
+    one: "Вибачте, ви можете згадати лише одного іншого користувача у публікації."
+    few: "Вибачте, ви можете згадати лише користувачів %{count} у публікації."
+    many: "Вибачте, ви можете згадати лише користувачів %{count} у публікації."
+    other: "Вибачте, ви можете згадати лише %{count}користувача у дописі."
+  no_mentions_allowed_newuser: "На жаль, нові користувачі не можуть згадувати інших користувачів."
+  too_many_mentions_newuser:
+    one: "Вибачте, нові користувачі можуть згадувати тільки одного користувача в кожному повідомленні."
+    few: "Вибачте, нові користувачі можуть згадувати тільки %{count} користувачі у повідомленні."
+    many: "Вибачте, нові користувачі можуть згадувати тільки %{count} користувачів у повідомленні."
+    other: "Вибачте, нові користувачі можуть згадувати тільки %{count} користувачів у повідомленні."
+  no_images_allowed_trust: "На жаль, ви не можете розмістити зображення в публікації"
   no_images_allowed: "Даруйте, нові користувачі не можуть вставляти зображення в дописи."
   too_many_images:
     one: "Даруйте, нові користувачі можуть вставляти тільки одне зображення в допис."
@@ -85,18 +295,28 @@ uk:
     many: "Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис."
     other: "Даруйте, нові користувачі можуть вставляти тільки %{count} прикріплень в допис."
   no_links_allowed: "Даруйте, нові користувачі не можуть вставляти посилання в дописи."
+  links_require_trust: "На жаль, ви не можете включати посилання у свої повідомлення."
   too_many_links:
     one: "Даруйте, нові користувачі можуть вставляти тільки одне посилання в допис."
     few: "Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис."
     many: "Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис."
     other: "Даруйте, нові користувачі можуть вставляти тільки %{count} посилань в допис."
+  contains_blocked_word: "Ваш пост містить слово, яке заборонено: %{word}"
+  contains_blocked_words: "Ваш пост містить кілька заборонених слів: %{words}"
   spamming_host: "Даруйте, Ви не можете вставити посилання на цей хост."
-  topic_not_found: "Щось пішло не так. Можливо цей допис було закрито або видалено, під час того як ви його переглядали?"
+  user_is_suspended: "Заблокованим користувачам заборонено писати."
+  topic_not_found: "Щось пішло не так. Можливо цей допис було закрито або видалено, під час того, як ви його переглядали?"
+  not_accepting_pms: "На жаль, %{username} в даний момент не приймає повідомлення."
+  max_pm_recepients: "Вибачте, ви можете надіслати повідомлення максимум %{recipients_limit} одержувачу."
+  pm_reached_recipients_limit: "Вибачте, ви не можете мати більше, ніж %{recipients_limit} одержувачів у повідомленні."
+  removed_direct_reply_full_quotes: "Автоматично видаляти цитату з усього попереднього допису."
   just_posted_that: "це дуже схоже на те, що ви нещодавно дописували"
   invalid_characters: "містить неприпустимі символи"
+  is_invalid: "не зовсім зрозуміло, це закінчене речення?"
   next_page: "наступна сторінка →"
   prev_page: "← попередня сторінка"
   page_num: "Сторінка %{num}"
+  home_title: "Головна"
   topics_in_category: "Теми в категорії '%{category}'"
   rss_posts_in_topic: "RSS-стрічка теми '%{topic}'"
   rss_topics_in_category: "RSS-стрічка тем у категорії '%{category}'"
@@ -104,30 +324,133 @@ uk:
   num_posts: "Дописи:"
   num_participants: "Учасники:"
   read_full_topic: "Читати тему цілком"
+  private_message_abbrev: "Пов."
   rss_description:
     latest: "Останні теми"
+    top: "Кращі теми"
+    top_all: "Кращі теми за весь час"
+    top_yearly: "Кращі теми за рік"
+    top_quarterly: "Кращі теми за квартал"
+    top_monthly: "Кращі теми за місяць"
+    top_weekly: "Кращі теми за тиждень"
+    top_daily: "Кращі теми за день"
     posts: "Останні дописи"
+    private_posts: "Останні приватні повідомлення"
     group_posts: "Останні дописи від %{group_name}"
+    group_mentions: "Останні згадки від %{group_name}"
     user_posts: "Останні дописи @%{username}"
     user_topics: "Останні теми @%{username}"
+    tag: "Позначені теми"
+    badge: "%{display_name} нагороду на %{site_title}"
   too_late_to_edit: "Цей допис було створено надто давно. Його вже не можна редагувати або видалити."
+  edit_conflict: "Цей пост був відредагований іншим користувачем і ваші зміни не можуть бути збережені."
+  revert_version_same: "Поточна версія така ж, як та, яку ви хочете повернути."
   excerpt_image: "зображення"
   groups:
+    success:
+      bulk_add:
+        one: "%{count} користувач був доданий до групи."
+        few: "%{count} користувача було додано до групи."
+        many: "%{count} користувачів було додано до групи."
+        other: "%{count} користувач був доданий до групи."
+    errors:
+      grant_trust_level_not_valid: "'%{trust_level}' неприпустимий рівень довіри."
+      can_not_modify_automatic: "Ви не можете змінити автоматичну групу."
+      member_already_exist:
+        one: "'%{username}' вже є членом цієї групи."
+        few: "Наступні користувачі вже є членами цієї групи: %{username}"
+        many: "Наступні користувачі вже є членами цієї групи: %{username}"
+        other: "Наступні користувачі вже є членами цієї групи: %{username}"
+      invalid_domain: "'%{domain}' є некоректним доменом."
+      invalid_incoming_email: "'%{email}' не є коректною адресою електронної пошти"
+      email_already_used_in_group: "'%{email}' вже використовується групою '%{group_name}'."
+      email_already_used_in_category: "'%{email}' вже використовується категорією'%{category_name}'."
+      cant_allow_membership_requests: "Ви не можете дозволяти користувацькі заявки для групи без будь-яких власників."
+      already_requested_membership: "Ви вже запросили членство в цій групі."
     default_names:
       everyone: "усі"
       admins: "адміністратори"
       moderators: "модератори"
       staff: "персонал"
+      trust_level_0: "trust_level_0"
       trust_level_1: "trust_level_1"
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
       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:
+      one: "%{count} допис"
+      few: "%{count} дописи"
+      many: "%{count} дописів"
+      other: "%{count} дописів"
+    "new-topic": |
+      Ласкаво просимо на сайт %{site_name} &mdash; **Дякую за відкриття нової теми!**
+
+      Коли ви створюєте нову тему, подумайте:
+
+      - Чи цікавий придуманий заголовок? Чи достатньо точно він описує те, що ви хочете обговорити у вашій темі?
+
+      - Про що ваша тема? Кому вона буде цікава? Чому вона важлива для обговорення? Який, на вашу думку, буде реакція спільноти на тему?
+
+      - Постарайтеся включити в текст повідомлення відповідні теги, за якими інші зможуть * знайти * тему. Виберіть розділ, до якого ваша тема підходить за змістом.
+
+      Більше інформації ви знайдете в нашому [керівництві користувача](%{base_path}/guidelines). Дане вікно буде показуватися, поки ви створюєте свої перші %{education_posts_text}.
+    "new-reply": |
+      Ласкаво просимо на сайт %{site_name} &mdash; **Спасибі за участь в обговоренні!**
+
+      - Як ви думаєте, чи поліпшить вашу відповідь обговорення в цілому, хоча б трохи?
+
+      - Будьте доброзичливі до учасників розмови.
+
+      - Конструктивна критика вітається, але не забувайте критикувати *ідеї*, а не людей.
+
+      Більше інформації ви знайдете в нашому [керівництві користувача](%{base_path}/guidelines). Дане вікно буде показуватися, поки ви створюєте свої перші %{education_posts_text}.
+    avatar: |
+      ### Як щодо зображення для вашого профілю?
+      Ви опублікували кілька тем і відповідей, але ваше зображення профілю не унікальне - це просто перша буква вашого імені.
+
+      Може бути вам варто **[відвідати свій профіль користувача] (%{profile_path})** і завантажити аватарку?
+
+      Коли кожен користувач має унікальну аватарку, стежити за обговореннями стає значно легше!
+    sequential_replies: |
+      ### Краще поєднувати кілька відповідей в один
+
+      Замість того, щоб писати і відправляти багато окремих відповідей поспіль, можна відповісти всім по порядку в одному повідомленні. Для цього потрібно вставляти цитату, потім відповідь на неї, потім знову цитату, потім відповідь, і т.д. Також, можна згадувати учасників діалогу через їх @псевдоніми.
+
+      Замість нового відповіді, зараз можна почати редагувати свій попередній відповідь і просто додати в нього нові цитати і відповіді та них. Для цього потрібно виділити необхідний текст і натиснути на кнопку, що з'явилася <b>відповісти цитуванням</b>.
+
+      Для більшості людей набагато простіше читати теми, у яких довгі відповіді і їх мало, ніж коли багато коротеньких відповідей.
+    dominating_topic: |
+      ### Нехай інші приєднаються до розмови
+
+      Ця тема явно важлива для вас &ndash; ви опублікували більше %{percent}% відповідей тут.
+
+      Чи впевнені ви, що так само даєте іншим людям можливість висловити свою точку зору. Чи можете ви запросити їх?
+    get_a_room: |
+      ### Покличте всіх взяти участь в розмові
+
+      необхідно відповісти %{count} раз користувачеві @%{reply_username} в цій конкретній темі!
+      Важлива дискусія включає в себе багато голосувань і точок зору. Чи можете ви залучити кого-небудь ще?
+
+      Не забувайте, якщо Ви хочете продовжити приватна розмова з конкретним учасником то, [send them a personal message](%{base_path}/u/%{reply_username}).
+    too_many_replies: "### Ви досягли межі відповідей в цю тему. \nНа жаль, нові користувачі тимчасово обмежені %{newuser_max_replies_per_topic} відповідей в цій темі. \nЗамість того, щоб додавати ще одну відповідь, будь ласка, подумайте про редагування попередніх відповідей або відвідайте інші теми.\n"
+    reviving_old_topic: |
+      ### Відновити обговорення в цій темі?
+
+      Остання відповідь у цю тему була **%{time_ago}**. Ваше повідомлення перемістить тему вгору в списку та повідомить всіх її учасників.
+
+      Ви впевнені, що хочете відновити це застаріле обговорення?
   activerecord:
     attributes:
       category:
         name: "Назва категорії"
       topic:
         title: "Назва"
+        featured_link: "Рекомендоване Посилання"
         category_id: "Категорія"
       post:
         raw: "Тіло"
@@ -136,23 +459,102 @@ uk:
     errors:
       <<: *errors
       models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "Ви можете прикріплювати попередження тільки до особистих повідомлень."
+              too_many_users: "Одночасно можна надсилати попередження лише одному користувачеві."
+              cant_send_pm: "На жаль, ви не можете надіслати особисте повідомлення цьому користувачеві."
+              no_user_selected: "Ви повинні вибрати дійсного користувача."
+              reply_by_email_disabled: "Відповідь електронною поштою вимкнено."
+              target_user_not_found: "Одного з користувачів, яким ви надсилаєте це повідомлення, не вдалося знайти."
+            featured_link:
+              invalid: "недійсна. URL-адреса повинна містити http:// або https://."
+              invalid_category: "не можна редагувати в цій категорії."
         user:
           attributes:
+            password:
+              common: "є одним із 10000 найпоширеніших паролів. Будь ласка, використовуйте більш безпечний пароль."
+              same_as_username: "те саме, що і ваше ім’я користувача. Будь ласка, використовуйте більш безпечний пароль."
+              same_as_email: "те саме, що і ваш email. Будь ласка, використовуйте більш безпечний пароль."
+              same_as_current: "те саме, що і ваш поточний пароль."
+              same_as_name: "те саме, що і ваше ім’я."
+              unique_characters: "має занадто багато повторюваних символів. Будь ласка, використовуйте більш безпечний пароль."
+            username:
+              same_as_password: "те саме, що і ваш пароль."
+            name:
+              same_as_password: "те саме, що і ваш пароль."
             ip_address:
               signup_not_allowed: "Вхід не дозволено з цього облікового запису."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Перепризначення основного email іншому користувачеві заборонено."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "не є дійсним кольором"
+        post_reply:
+          base:
+            different_topic: "Повідомлення та відповіді повинні належати одній темі."
         web_hook:
           attributes:
             payload_url:
               invalid: "Хибний URL. URL має містити http:// або https://. І пробіли не дозволяються."
+        custom_emoji:
+          attributes:
+            name:
+              taken: вже використовується іншими emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "повинні бути в майбутньому."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Наступні інтерполяційні ключі недійсні: &quot;%{keys}&quot;'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Забагато слів для цієї дії"
   uncategorized_category_name: "Без категорій"
-  vip_category_name: "Lounge"
+  vip_category_name: "Фойе"
   vip_category_description: "A category exclusive to members with trust level 3 and higher."
+  meta_category_name: "Зворотній зв’язок"
+  meta_category_description: "Обговорення цього форуму: структура та розташування матеріалів на ньому, ідеї можливих поліпшень в його роботі, анонси змін на форумі."
   staff_category_name: "Персонал"
-  staff_category_description: "Закрита категорія для обговорень між персоналом. Теми бачать тільки адміністратори та модератори."
+  staff_category_description: "Приватна категорія для обговорень між персоналом. Теми бачать тільки адміністратори та модератори."
+  discourse_welcome_topic:
+    title: "Ласкаво просимо в Discourse"
+  lounge_welcome:
+    title: "Ласкаво просимо в Фойе"
+  admin_quick_start_title: "Спочатку ПРОЧИТАЙТЕ мене: короткий посібник Адміністратора"
   category:
     topic_prefix: "Про категорію %{category}"
+    replace_paragraph: "(Замініть цей перший абзац коротким описом вашої нової категорії. Даний опис буде відображено в області вибору категорії, тому намагайтеся, щоб воно не перевищувало 200 символів.)"
+    post_template: "%{replace_paragraph}\n\nВикористовуйте наступний текст для докладного опису або для оприлюднення правил розділу:\n\n- Чому потрібно використовувати цей розділ? Навіщо він?\n\n- Наскільки розділ відрізняється від раніше створених?\n\n- Що повинні містити теми в цьому розділі?\n\n- Чи дійсно потрібен цей розділ? Чи можемо ми об’єднати його з іншими категоріями чи підкатегоріями?\n"
     errors:
-      depth: "Ви не можете вкладати підкатегорію під іншу"
+      not_found: "Категорія не знайдена!"
+      uncategorized_parent: "Розділу для тем поза розділами не можна призначити батьківський розділ."
+      self_parent: "Підрозділ не може бути батьківським для самого себе."
+      depth: "Підрозділ не може бути батьківським, тому що допустимо тільки один рівень вкладеності розділів."
+      invalid_email_in: "'%{email}' не є коректною адресою електронної пошти"
+      email_already_used_in_group: "'%{email}' вже використовується групою '%{group_name}'."
+      email_already_used_in_category: "'%{email}' вже використовується категорією '%{category_name}'."
+      description_incomplete: "Опис категорії повинен мати принаймні один абзац."
+      permission_conflict: "Будь-яка група, якій дозволено доступ до підкатегорії, також повинна мати доступ до батьківської категорії. Наступні групи мають доступ до однієї з підкатегорій, але не мають доступу до батьківської категорії: %{group_names}."
+      disallowed_topic_tags: "У цій темі є теги, не дозволені цією категорією: '%{tags}'"
+      disallowed_tags_generic: "У цій темі заборонені теги."
+    cannot_delete:
+      uncategorized: "Ця категорія особлива. Вона призначена для зберігання тем, які не мають категорії; вона не може бути видалена."
+      has_subcategories: "Неможливо видалити цей розділ, тому що в ньому є підрозділи."
+      topic_exists:
+        one: "Неможливо видалити цю категорію, тому що в ній міститься %{count} тема. Найстаріша тема %{topic_link}."
+        few: "Неможливо видалити цю категорію, тому що в ній міститься %{count} теми. Найстаріша тема %{topic_link}."
+        many: "Неможливо видалити цю категорію, тому що в ній міститься %{count} тем. Найстаріша тема %{topic_link}."
+        other: "Неможливо видалити цю категорію, тому що в ній міститься %{count} тем. Найстаріша тема %{topic_link}."
+      topic_exists_no_oldest: "Неможливо видалити цей розділ, тому що кількість тем у ньому дорівнює %{count}."
+    uncategorized_description: "Теми, які не потребують категорії, або не розподілені до будь-якої категорії."
   trust_levels:
     newuser:
       title: "новий користувач"
@@ -160,9 +562,37 @@ uk:
       title: "базовий користувач"
     member:
       title: "учасник"
+    regular:
+      title: "активний"
     leader:
       title: "провідник"
+    change_failed_explanation: "Ви намагаєтеся знизити користувача %{user_name} до рівня довіри '%{new_trust_level}'. Однак, його рівень довіри вже '%{current_trust_level}'. %{user_name} залишиться з рівнем довіри '%{current_trust_level}'. Якщо ви все ж хочете знизити користувача, заблокуйте спочатку рівень довіри."
+  post:
+    image_placeholder:
+      broken: "Це зображення зламано"
+    has_likes:
+      one: "%{count} Симпатія"
+      few: "%{count} Симпатії"
+      many: "%{count} Симпатій"
+      other: "%{count} Симпатій"
   rate_limiter:
+    slow_down: "Ви виконали цю дію занадто багато разів, спробуйте ще раз пізніше."
+    too_many_requests: "Ви виконуєте цю дію занадто часто. Зачекайте будь-ласка %{time_left} перш ніж спробувати знову."
+    by_type:
+      first_day_replies_per_day: "Ви досягли максимальної кількості відповідей, які новий користувач може створити в перший день. Будь ласка, зачекайте %{time_left} перш ніж спробувати знову."
+      first_day_topics_per_day: "Ви досягли ліміту на створення тем для нового користувача в перший день на сайті. Будь ласка, спробуйте через %{time_left}."
+      create_topic: "Ви створюєте теми занадто швидко. Будь ласка зачекайте %{time_left}, потім спробуйте ще раз"
+      create_post: "Ви відповідаєте занадто швидко. Будь ласка, зачекайте %{time_left} перед наступною спробою."
+      delete_post: "Ви видаляєте повідомлення занадто швидко. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      public_group_membership: "Ви приєднуєтеся / залишаєте групи занадто часто. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      topics_per_day: "Ви досягли максимальної кількості нових тем. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      pms_per_day: "Ви досягли максимальної кількості повідомлень. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      create_like: "Ви досягли максимальної кількості симпатій на сьогодні. Будь ласка зачекайте%{time_left} перед наступною спробою."
+      create_bookmark: "Ви досягли максимальної кількості закладок. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      edit_post: "Ви досягли максимальної кількості правок. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      live_post_counts: "Ви занадто швидко переглядаєте пости. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      unsubscribe_via_email: "Ви досягли максимальної кількості відписок через email на сьогодні. Будь ласка зачекайте %{time_left} перед наступною спробою."
+      topic_invitations_per_day: "Ви досягли максимальної кількості запрошень в теми. Будь ласка зачекайте %{time_left} перед наступною спробою."
     hours:
       one: "%{count} година"
       few: "%{count} години"
@@ -178,9 +608,65 @@ uk:
       few: "%{count} секунди"
       many: "%{count} секунд"
       other: "%{count} секунд"
+    short_time: "кілька секунд"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 хв"
+      less_than_x_seconds:
+        one: "< %{count} сек"
+        few: "< %{count} сек"
+        many: "< %{count} сек"
+        other: "< %{count} сек"
+      x_seconds:
+        one: "< %{count} сек"
+        few: "< %{count} сек"
+        many: "< %{count} сек"
+        other: "< %{count} сек"
+      less_than_x_minutes:
+        one: "< %{count} мин"
+        few: "< %{count} мин"
+        many: "< %{count} мин"
+        other: "< %{count} мин"
+      x_minutes:
+        one: "< %{count} мин"
+        few: "< %{count} мин"
+        many: "< %{count} мин"
+        other: "< %{count} мин"
+      about_x_hours:
+        one: "%{count} г"
+        few: "%{count} г"
+        many: "%{count} г"
+        other: "%{count} г"
+      x_days:
+        one: "%{count} дн"
+        few: "%{count} дн"
+        many: "%{count} дн"
+        other: "%{count} дн"
+      about_x_months:
+        one: "%{count} міс"
+        few: "%{count} міс"
+        many: "%{count} міс"
+        other: "%{count} міс"
+      x_months:
+        one: "%{count} міс"
+        few: "%{count} міс"
+        many: "%{count} міс"
+        other: "%{count} міс"
+      about_x_years:
+        one: "%{count} рік"
+        few: "%{count} роки"
+        many: "%{count} років"
+        other: "%{count} років"
+      over_x_years:
+        one: "%{count} рік"
+        few: "%{count} роки"
+        many: "%{count} років"
+        other: "%{count} років"
+      almost_x_years:
+        one: "%{count} рік"
+        few: "%{count} роки"
+        many: "%{count} років"
+        other: "%{count} років"
     distance_in_words_verbose:
       half_a_minute: "щойно"
       less_than_x_seconds: "щойно"
@@ -189,7 +675,53 @@ uk:
         few: "%{count} секунд тому"
         many: "%{count} секунд тому"
         other: "%{count} секунд тому"
+      less_than_x_minutes:
+        one: "менше %{count} хвилини тому"
+        few: "менше %{count} хвилини тому"
+        many: "менше %{count} хвилин тому"
+        other: "менше %{count} хвилин тому"
+      x_minutes:
+        one: "%{count} хвилину тому"
+        few: "%{count} хвилини тому"
+        many: "%{count} хвилини тому"
+        other: "%{count} хвилини тому"
+      about_x_hours:
+        one: "%{count} годину тому"
+        few: "%{count} години тому"
+        many: "%{count} годин тому"
+        other: "%{count} годин тому"
+      x_days:
+        one: "%{count} день тому"
+        few: "%{count} днів тому"
+        many: "%{count} днів тому"
+        other: "%{count} днів тому"
+      about_x_months:
+        one: "близько %{count} місяць тому"
+        few: "близько %{count} місяці тому"
+        many: "близько %{count} місяців тому"
+        other: "близько %{count} місяців тому"
+      x_months:
+        one: "%{count} місяць тому"
+        few: "%{count} місяців тому"
+        many: "%{count} місяців тому"
+        other: "%{count} місяців тому"
+      about_x_years:
+        one: "близько %{count} року тому"
+        few: "близько %{count} років тому"
+        many: "близько %{count} років тому"
+        other: "близько %{count} років тому"
+      over_x_years:
+        one: "більше %{count} року тому"
+        few: "більше %{count} роки тому"
+        many: "більше %{count} років тому"
+        other: "більше %{count} років тому"
+      almost_x_years:
+        one: "майже %{count} рік тому"
+        few: "майже %{count} роки тому"
+        many: "майже %{count} років тому"
+        other: "майже %{count} років тому"
   password_reset:
+    no_token: "На жаль, дане посилання на зміну пароля застаріло. Натисніть на кнопку \"Увійти\", а потім на \"Я забув свій пароль\", щоб згенерувати нове посилання для зміни пароля."
     choose_new: "Вибрати новий пароль"
     choose: "Вибрати пароль"
     update: "Оновити пароль"
@@ -197,61 +729,195 @@ uk:
     title: "Скинути пароль"
     success: "Ви успішно змінили свій пароль і зараз Ви в системі."
     success_unapproved: "Ви успішно змінили свій пароль."
+  email_login:
+    invalid_token: "Вибачте, це посилання для входу вже не діє. Оберіть кнопку \"Вхід\" та використайте посилання 'Я забув свій пароль' щоби отримати нове посилання."
+    title: "Вхід по E-mail"
+  user_auth_tokens:
+    browser:
+      chrome: "Google Chrome"
+      discoursehub: "Програма DiscourseHub"
+      edge: "Microsoft Edge"
+      firefox: "Firefox"
+      ie: "Internet Explorer"
+      opera: "Opera"
+      safari: "Safari"
+      unknown: "невідомий броузер"
+    device:
+      android: "Android Пристрій"
+      chromebook: "Chromebook"
+      ipad: "iPad"
+      iphone: "iPhone"
+      ipod: "iPod"
+      linux: "GNU/Linux Комп’ютер"
+      mac: "Mac"
+      mobile: "Мобильний пристрій"
+      windows: "Windows Комп’ютер"
+      unknown: "невідомий пристрій"
+    os:
+      android: "Android"
+      chromeos: "ChromeOS"
+      ios: "iOS"
+      linux: "Linux"
+      macos: "macOS"
+      windows: "Microsoft Windows"
+      unknown: "невідома операційна система"
   change_email:
     confirmed: "Адресу вашої електронної скриньки оновлено."
-    please_continue: "Продовжити у %{site_name}"
+    please_continue: "Продовжити на %{site_name}"
     error: "Під час зміни адреси Вашої електронної скриньки трапилася помилка. Можливо, ця адреса вже використовується?"
+    error_staged: "Під час зміни вашої електронної адреси сталася помилка. Адреса вже використовується іншим користувачем."
+    already_done: "На жаль, це підтвердження більше не дійсне. Можливо, вашу електронну пошту вже змінено?"
+    authorizing_old:
+      title: "Дякую за підтвердження вашої email-адреси"
+      description: "Ми відправили повідомлення з посиланням для підтвердження вашої нової адреси."
+  associated_accounts:
+    revoke_failed: "Не вдалося від’єднати від облікового запису %{provider_name}."
+    connected: "(пов’язаний)"
   activation:
-    already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?"
-    continue_button: "Продовжити у %{site_name}"
-    welcome_to: "Ласкаво просимо до сайта %{site_name}!"
-    approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"
+    action: "Натисніть тут для активації вашого акаунту"
+    already_done: "Вибачте, посилання на активацію облікового запису застаріло. Можливо, ваш обліковий запис вже активовано?"
+    please_continue: "Ваш новий акаунт підтверджено, ви будете перенаправлені на головну сторінку."
+    continue_button: "Продовжити на %{site_name}"
+    welcome_to: "Ласкаво просимо на сайт %{site_name}!"
+    approval_required: "Модератор повинен вручну затвердити ваш новий акаунт, перш ніж ви зможете отримати доступ до цього форуму. Ви отримаєте електронний лист, коли ваш обліковий запис буде затверджено!"
+    missing_session: "Ми не можемо підтвердити, чи був обліковий запис створено, будь ласка, переконайтеся, що у вашому браузері включені cookies."
+    activated: "Вибачте, цей обліковий запис уже активовано."
+    admin_confirm:
+      title: "Підтвердіть Обліковий запис Адміністратора"
+      grant: "Надати Доступ Адміністратора"
+      complete: "<b>%{target_username}</b> зараз є адміністратором."
+      back_to: "Повернутися до %{title}"
   reviewable_score_types:
     needs_approval:
       title: "Потребує схвалення"
   post_action_types:
     off_topic:
-      title: "Недотичне до теми"
-      long_form: "flagged this as off-topic"
+      title: "Офтопік (не по темі)"
+      description: "Цей допис не стосується поточної дискусії відповідно до її назви та першого повідомлення, ймовірно, це має бути переміщено в інше місце."
+      short_description: "Не стосується цієї дискусії"
+      long_form: "позначили це як off-topic (не по темі)"
     spam:
       title: "Спам"
+      description: "Ця публікація - це реклама, або вандалізм. Це не корисно та не стосується поточної теми або дискусії."
+      short_description: "Це реклама або вандалізм"
       long_form: "flagged this as spam"
+      email_title: 'Позначено як спам: "%{title}"'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
-      title: "Неприпустиме"
-      long_form: "flagged this as inappropriate"
+      title: "Неприпустимо"
+      description: 'Цей допис містить контент, який розумна людина вважатиме образливим, неприпустимим або таким, що порушує <a href="/guidelines">принципи нашої спільноти</a>.'
+      short_description: 'Порушення наших <a href="%{base_path}/guidelines">принципів спільноти</a>'
+      long_form: "позначити це як неприйнятне"
     notify_user:
-      email_body: "%{link}\n\n%{message}"
+      title: "Відправити @{{username}} повідомлення"
+      description: "Я хочу поговорити з автором особисто про цей пост."
+      short_description: "Я хочу поговорити з автором особисто про цей пост."
+      long_form: "повідомлений користувач"
+      email_title: 'Ваш допис у "%{title}"'
+      email_body: "%{link}\n\n%{message}\n"
     notify_moderators:
+      title: "Інша причина"
+      description: "Цей пост потребує модерації з іншої причини, яка відсутня у списку вище."
+      short_description: "Потребує втручання модератора з інших причин"
+      long_form: "відзначили це для модерації"
+      email_title: 'Допис у темі "%{title}"потребує модерації'
       email_body: "%{link}\n\n%{message}"
     bookmark:
-      title: "Лишити закладку"
-      description: "Bookmark this post"
-      short_description: "Bookmark this post"
-      long_form: "bookmarked this post"
+      title: "Додати закладку"
+      description: "Додати допис у закладки"
+      short_description: "Додати допис у закладки"
+      long_form: "додали допис у закладки"
     like:
       title: "Вподобати"
-      description: "Like this post"
-      short_description: "Like this post"
-      long_form: "liked this"
+      description: "Мені подобається цей допис"
+      short_description: "Мені подобається"
+      long_form: "це сподобалось"
+  draft:
+    sequence_conflict_error:
+      title: "помилка чернетки"
+      description: "Чернетка редагується в іншому вікні. Перезавантажте цю сторінку."
+  draft_backup:
+    pm_title: "Резервні чернетки з поточних тем"
+    pm_body: "Тема, що містить резервні чернетки"
+  user_activity:
+    no_default:
+      self: "Поки немає активностей."
+      others: "Немає активностей."
+    no_bookmarks:
+      self: "У вас немає публікацій у закладках. Закладки дозволяють швидко переходити до обраних дискусій."
+      others: "Закладок немає."
+    no_likes_given:
+      self: "Вам не сподобалися ніякі повідомлення."
+      others: "Вподобаних повідомлень немає."
+    no_replies:
+      self: "Ви не відповіли на жоден допис."
+      others: "Немає відповідей"
+    no_drafts:
+      self: "У вас немає чернеток; почніть складати відповідь в будь-якій темі, і вона буде автоматично збережена як нова чернетка."
+  webauthn:
+    validation:
+      invalid_type_error: "Наданий тип webauthn був недійсним. Дійсні типи є webauthn.get та webauthn.create."
+      challenge_mismatch_error: "Наданий запит не відповідає запиту, згенерованому сервером аутентифікації."
+      invalid_origin_error: "Походження запиту на аутентифікацію (origin) не співпадає з тим, що є на сервері."
+      malformed_attestation_error: "Під час декодування даних про атестацію сталася помилка."
+      invalid_relying_party_id_error: "Ідентифікатор перевіряючої сторони запиту аутентифікації не співпадає з ідентифікатором сторони сервера відповіді."
+      user_verification_error: "Потрібна перевірка користувача."
+      unsupported_public_key_algorithm_error: "Наданий алгоритм відкритого ключа не підтримується сервером."
+      unsupported_attestation_format_error: "Формат атестації не підтримується сервером."
+      credential_id_in_use_error: "Наданий ID вже використовується."
+      public_key_error: "Помилка перевірки відкритого ключа для облікових даних."
+      ownership_error: "Ключ безпеки не належить користувачу."
+      not_found_error: "Не вдалося знайти ключ безпеки із наданим ID."
   topic_flag_types:
     spam:
-      title: "Spam"
-      description: "This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature."
-      long_form: "flagged this as spam"
+      title: "Спам"
+      description: "Це повідомлення є рекламою. Воно не містить корисної інформації і не має відношення до даної теми."
+      long_form: "позначено як спам"
+      short_description: "Це реклама"
     inappropriate:
-      title: "Inappropriate"
-      long_form: "flagged this as inappropriate"
+      title: "Недоречний"
+      description: 'Ця тема містить зміст, який розумна людина вважатиме образливим, неприпустимим, або таким, що порушує <a href="https://forum.osvita.ua/guidelines">принципи нашої спільноти</a>.'
+      long_form: "позначено як неприйнятне"
+      short_description: 'Порушення наших <a href="%{base_path}/guidelines">принципів спільноти</a>'
     notify_moderators:
-      email_title: 'The topic "%{title}" requires moderator attention'
+      title: "Інша причина"
+      description: 'Ця тема потребує уваги загального персоналу на основі <a href="%{base_path}/guidelines">вказівок</a> , <a href="%{tos_url}">TOS</a> або з іншої причини, не зазначеної вище.'
+      long_form: "скарга модератору"
+      short_description: "Потребує втручання модератора з інших причин"
+      email_title: 'Тема "%{title}" потребує уваги модератора'
       email_body: "%{link}\n\n%{message}"
+  flagging:
+    you_must_edit: '<p>Ваш пост був позначений спільнотою. Будь ласка, <a href="%{path}">перевірте свої особисті повідомлення</a>.</p>'
+    user_must_edit: "<p>Цей пост був позначений спам-прапорцем спільнотою та тимчасово прихований.</p>"
+  ignored:
+    hidden_content: "<p>Проігнорований зміст</p>"
   archetypes:
     regular:
       title: "Звичайна тема"
+    banner:
+      title: "Тема-оголошення"
+      message:
+        make: "Ця тема тепер є оголошенням і буде відображатися зверху на всіх сторінках, поки користувачі не приховають її, кожен сам для себе."
+        remove: "Ця тема тепер не є оголошенням і більше не буде доступна широкому загалу вгорі на всіх сторінках."
+  unsubscribed:
+    title: "Налаштування електронних листів змінені!"
+    description: "<b>Налаштування</b> електронної пошти для <b>%{email}</b> було оновлено. Щоб змінити налаштування електронної пошти, <a href='%{url}'>відвідайте налаштування користувача</a> ."
+    topic_description: "Щоб повторно підписатися на %{link}, використовуйте кнопку сповіщень внизу або праворуч від теми."
+    private_topic_description: "Щоб повторно підписатися, використовуйте елемент сповіщення внизу або праворуч від теми."
   unsubscribe:
-    title: "Відпісатися"
+    title: "Відписатися"
+    stop_watching_topic: "Перестати слідкувати за цією темою, %{link}"
+    mute_topic: "Відмовитись від усіх повідомлень з теми, %{link}"
+    unwatch_category: "Перестати слідкувати за всіма темами в категорії %{category}"
+    mailing_list_mode: "Відключити режим постійної розсилки"
+    all: "Не надсилати мені жодних листів від %{sitename}"
+    different_user_description: "На даний момент ви ввійшли як інший користувач, ніж той, кому ми надіслали електронну пошту. Вийдіть із системи або перейдіть в анонімний режим та спробуйте ще раз."
+    not_found_description: "На жаль, ми не змогли знайти інформацію про вашу розсилку. Можливо посилання, отримане у листі вами, більше не є дійсним?"
     log_out: "Вийти"
+    submit: "Зберегти налаштування"
     digest_frequency:
+      title: "Ви отримуєте зведені повідомлення E-mail пошти %{frequency}"
+      select_title: "Встановіть частоту відправки E-mail листів:"
       never: "ніколи"
       every_30_minutes: "кожні 30 хвилин"
       every_hour: "щогодини"
@@ -260,74 +926,159 @@ uk:
       every_month: "щомісяця"
       every_six_months: "що шість місяців"
   user_api_key:
+    title: "Дозволити доступ до додатка"
+    authorize: "Авторизувати"
+    read: "читання"
+    read_write: "читання/запис"
+    description: '"%{application_name}" запитує наступний доступ до вашого облікового запису:'
+    instructions: 'Ми щойно створили для вас новий ключ API для користування &quot;%{application_name}&quot;, вставте наступний ключ у свою програму:'
+    otp_description: 'Ви хочете дозволити &quot;%{application_name}&quot; отримати доступ до цього сайту?'
     otp_confirmation:
       confirm_title: "Продовжити у %{site_name}"
+      logging_in_as: "Увійти як %{username}"
+      confirm_button: Завершити авторизацію
+    no_trust_level: "На жаль, ви не володієте необхідним рівнем довіри для доступу до API"
+    generic_error: "Шкода, але ми не можемо надати Вам API ключі, дана опція можливо відключена адміністратором сайту."
+    scopes:
+      message_bus: "Поточні оновлення"
+      notifications: "Прочитати і стерти повідомлення"
+      push: "Push-повідомлення для зовнішніх сервісів"
+      session_info: "Прочитати інформацію про сеанс користувача"
+      read: "Прочитати все"
+      write: "Написати все"
+      one_time_password: "Створити токен для одноразового входу"
+    invalid_public_key: "Вибачте, відкритий ключ недійсний."
+    invalid_auth_redirect: "Вибачте, цей auth_redirect хост не дозволено."
+    invalid_token: "Токен відсутній, недійсний або прострочений."
+  flags:
+    errors:
+      already_handled: "Скарга вже була оброблена"
   reports:
     default:
       labels:
         count: Кількість
+        percent: Відсотків
         day: День
     post_edits:
+      title: "Редагувати допис"
       labels:
         edited_at: Дата
         post: Допис
         editor: Редактор
+        author: Автор
         edit_reason: Причина
+      description: "Кількість нових правок дописів."
     user_flagging_ratio:
+      title: "Коефіцієнт Позначок Користувача"
       labels:
         user: Користувач
+        agreed_flags: Погоджені скарги
+        disagreed_flags: Відхилені скарги
+        ignored_flags: Ігноровані скарги
         score: Бал
+      description: "Список користувачів, упорядкований по співвідношенню реакції персоналу на їхні прапори (за незгоди)."
     moderators_activity:
+      title: "Діяльність Модератора"
       labels:
         moderator: Модератор
+        flag_count: Скарги розглянуті
+        time_read: Час читання
+        topic_count: Створених тем
+        post_count: Створених дописів
+        pm_count: PMs створено
+        revision_count: Редакція
+      description: "Список дій модератора, включаючи переглянуті прапори, час читання, створені теми та дописи, особисті повідомлення та зміни."
     flags_status:
+      title: "Статус Прапорів"
+      values:
+        agreed: Погоджено
+        disagreed: Відхилено
+        deferred: Відкладено
+        no_action: Немає дій
       labels:
         flag: Тип
+        assigned: Призначені теми
+        poster: Автор
+        flagger: Доповідач
+        time_to_resolution: Час рішення
+      description: "Список статусів прапорів, включаючи тип прапора, плакат, доповідач та час до вирішення."
     visits:
-      title: "Відвідини користувачів"
+      title: "Візити користувачів"
       xaxis: "День"
-      yaxis: "Кількість відвідин"
+      yaxis: "Кількість візитів"
+      description: "Кількість всіх відвідувань користувачів."
     signups:
-      xaxis: "День"
+      title: "Реєстрація"
+      xaxis: "Дата"
+      yaxis: "Кількість реєстрацій"
+      description: "Реєстрація нових акаунтів за цей період."
     new_contributors:
+      title: "Нові Учасники"
       xaxis: "День"
+      yaxis: "Кількість нових учасників"
+      description: "Кількість користувачів, які зробили свій перший допис в цей період."
     consolidated_page_views:
+      title: "Консолідовані перегляди сторінок"
+      xaxis:
+        page_view_crawler: "Сканери"
+        page_view_anon: "Анонімний користувач"
+        page_view_logged_in: "Зареєстровані користувачі"
       yaxis: "День"
+      description: "Перегляди сторінок для зареєстрованих користувачів, анонімних користувачів і сканерів."
       labels:
         post: Допис
         editor: Редактор
+        author: Автор
         edit_reason: Причина
     dau_by_mau:
+      title: "DAU/MAU"
       xaxis: "День"
+      yaxis: "DAU/MAU"
+      description: "Кількість учасників, які увійшли в систему в останній день, поділене на кількість учасників, які увійшли в систему минулого місяця, повертає %, який вказує на 'липкість' спільноти. Прагніть до >30%."
     daily_engaged_users:
+      title: "Щоденно Залучені Користувачі"
       xaxis: "День"
+      yaxis: "Залучені Користувачі"
+      description: "Кількість користувачів, яким подобалися повідомлення або вони публікували їх в останній день."
     profile_views:
-      xaxis: "День"
+      title: "Перегляди профілів"
+      xaxis: "Дата"
+      yaxis: "Кількість переглядів профілів користувачів"
+      description: "Всього нових переглядів профілів користувачів."
     topics:
       title: "Теми"
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Кількість нових тем"
+      description: "Нові теми за цей період."
     posts:
       title: "Дописи"
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Кількість нових дописів"
+      description: "Нові пости, створені за цей період"
     likes:
       title: "Вподобання"
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Кількість нових вподобань"
+      description: "Кількість нових вподобань."
     flags:
       title: "Скарги"
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Кількість скарг"
+      description: "Кількість нових скарг."
     bookmarks:
       title: "Закладки"
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Кількість нових закладок"
+      description: "Кількість нових тем та дописів, доданих в закладки."
     users_by_trust_level:
       title: "Користувачі за Рівнем довіри"
       xaxis: "Рівень довіри"
       yaxis: "Кількість користувачів"
+      labels:
+        level: Рівень
+      description: "Кількість користувачів, згрупованих за рівнем довіри."
     users_by_type:
+      title: "Користувачі за Типом"
       xaxis: "Тип"
       yaxis: "Кількість користувачів"
       labels:
@@ -336,26 +1087,50 @@ uk:
         admin: Адмін
         moderator: Модератор
         suspended: Призупинені
+        silenced: Відключений
+      description: "Кількість користувачів, згрупованих по адміністраторам, модераторам, призупиненим та відключеним."
+    trending_search:
+      title: Тенденції Пошуку
+      labels:
+        term: Правило
+        searches: Пошуки
+        click_through: CTR
+      description: "Найпопулярніші пошукові запити та їх рейтинг кліків."
     emails:
       title: "Листів надіслано"
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Кількість листів"
+      description: "Кількість нових відправлених листів."
     user_to_user_private_messages:
-      xaxis: "День"
+      title: "Користувач-користувач (за винятком відповідей)"
+      xaxis: "Дата"
+      yaxis: "Кількість повідомлень"
+      description: "Кількість нових особистих повідомлень."
     user_to_user_private_messages_with_replies:
+      title: "Користувач-користувач (з відповідями)"
       xaxis: "День"
+      yaxis: "Кількість повідомлень"
+      description: "Кількість всіх нових особистих повідомлень та відповідей."
     system_private_messages:
       title: "Системні"
-      xaxis: "День"
+      xaxis: "Дата"
+      yaxis: "Кількість повідомлень"
+      description: "Кількість особистих повідомлень, що відправляються системою автоматично."
     moderator_warning_private_messages:
       title: "Попередження модератора"
-      xaxis: "День"
+      xaxis: "Дата"
+      yaxis: "Кількість попереджень"
+      description: "Кількість попереджень, відправлених особистими повідомленнями від модераторів."
     notify_moderators_private_messages:
       title: "Сповіщення модераторів"
-      xaxis: "День"
+      xaxis: "Дата"
+      yaxis: "Кількість скарг"
+      description: "Кількість подій, коли модератори були конфіденційно повідомлені прапором."
     notify_user_private_messages:
       title: "Сповіщення користувача"
       xaxis: "День"
+      yaxis: "Кількість скарг"
+      description: "Кількість подій, коли користувачі були конфіденційно повідомлені прапором."
     top_referrers:
       title: "Дали найбільше посилань"
       xaxis: "Користувач"
@@ -365,8 +1140,9 @@ uk:
         user: "Користувач"
         num_clicks: "Переходи"
         num_topics: "Теми"
+      description: "Користувачі перераховані за кількістю кліків по посиланнях, якими вони поділилися."
     top_traffic_sources:
-      title: "Головні джерела трафіку"
+      title: "Топ джерел трафіку"
       xaxis: "Домен"
       num_clicks: "Переходи"
       num_topics: "Теми"
@@ -375,200 +1151,1380 @@ uk:
         domain: Домен
         num_clicks: Переходи
         num_topics: Теми
+      description: "Зовнішні джерела, які пов’язані з цим сайтом найбільше."
     top_referred_topics:
-      title: "Найбільше посилаються на"
+      title: "Топ тем, на які найбільше посилаються"
       labels:
         num_clicks: "Переходи"
         topic: "Тема"
+      description: "Теми, які отримали найбільшу кількість кліків із зовнішніх джерел."
     page_view_anon_reqs:
-      xaxis: "День"
+      title: "Анонімний"
+      xaxis: "Дата"
+      yaxis: "Гостьових переглядів сторінок"
+      description: "Кількість нових переглядів сторінок відвідувачами, які не ввійшли в обліковий запис."
     page_view_logged_in_reqs:
-      xaxis: "День"
+      title: "Форумчани"
+      xaxis: "Дата"
+      yaxis: "Авторизованих переглядів сторінок"
+      description: "Кількість нових переглядів сторінок від зареєстрованих користувачів."
     page_view_crawler_reqs:
-      xaxis: "День"
+      title: "Переглядів сторінок пошуковими системами"
+      xaxis: "Дата"
+      yaxis: "Переглядів сторінок пошуковими системами"
+      description: "Загальна кількість переглядів сторінок веб-сканерами за період."
     page_view_total_reqs:
-      xaxis: "День"
+      title: "Переглядів"
+      xaxis: "Дата"
+      yaxis: "Всього Переглядів Сторінок"
+      description: "Кількість нових переглядів сторінок усіма відвідувачами."
     page_view_logged_in_mobile_reqs:
-      xaxis: "День"
+      title: "Авторизованих переглядів сторінок"
+      xaxis: "Дата"
+      yaxis: "Переглядів сторінок з авторизованих мобільних пристроїв"
+      description: "Кількість нових переглядів сторінок авторизованими користувачами на мобільних пристроях."
     page_view_anon_mobile_reqs:
-      xaxis: "День"
+      title: "Гостьових переглядів сторінок"
+      xaxis: "Дата"
+      yaxis: "Гостьових переглядів сторінок з мобільних пристроїв"
+      description: "Кількість нових переглядів сторінок від анонімних відвідувачів на мобільному пристрої."
     http_background_reqs:
-      xaxis: "День"
+      title: "Фонові"
+      xaxis: "Дата"
+      yaxis: "Запити оновлень в режимі реального часу"
     http_2xx_reqs:
-      xaxis: "День"
+      title: "HTTP 2xx (OK)"
+      xaxis: "Дата"
+      yaxis: "Успішні запити (статус 2xx)"
     http_3xx_reqs:
-      xaxis: "День"
+      title: "HTTP 3xx (переадресація)"
+      xaxis: "Дата"
+      yaxis: "Запити з переадресацією (статус 3xx)"
     http_4xx_reqs:
-      xaxis: "День"
+      title: "HTTP 4xx (помилка клієнта)"
+      xaxis: "Дата"
+      yaxis: "Запити з помилкою клієнта (статус 4xx)"
     http_5xx_reqs:
-      xaxis: "День"
+      title: "HTTP 5xx (помилка сервера)"
+      xaxis: "Дата"
+      yaxis: "Запити з помилкою сервера (статус 5xx)"
     http_total_reqs:
       title: "Всього"
-      xaxis: "День"
-    time_to_first_response:
-      xaxis: "День"
-    topics_with_no_response:
-      xaxis: "День"
+      xaxis: "Дата"
       yaxis: "Всього"
+    time_to_first_response:
+      title: "Час до першої відповіді"
+      xaxis: "Дата"
+      yaxis: "Середній час, годин"
+      description: "Середній час (в годинах) першого відповіді на нові теми."
+    topics_with_no_response:
+      title: "Теми без відповідей"
+      xaxis: "Дата"
+      yaxis: "Всього"
+      description: "Кількість створених нових тем, які не отримали відповіді."
     mobile_visits:
-      xaxis: "День"
+      title: "Відвідування користувачів (мобільні)"
+      xaxis: "Дата"
       yaxis: "Кількість відвідин"
+      description: "Кількість унікальних користувачів, які відвідали за допомогою мобільного пристрою."
+    web_crawlers:
+      title: "Агенти користувачів Web Crawler"
+      labels:
+        user_agent: "User Agent"
+        page_views: "Переглядів"
+      description: "Список агентів користувача, відсортоване за переглядами сторінок."
     suspicious_logins:
+      title: "Підозрілі Логіни"
       labels:
         user: Користувач
+        client_ip: IP-адреса клієнта
         location: Місцеположення
+        browser: Броузер
+        device: Пристрій
+        os: Операційна система
+        login_time: Час авторизації
+      description: "Відомості про нові облікові записи, які підозріло відрізняються від попередніх."
     staff_logins:
+      title: "Логін Адміністратора"
       labels:
         user: Користувач
-        location: Місцеположення
+        location: Місце розташування
+        login_at: Увійти на
+      description: "Список часу входу адміністратора з місцем розташування."
     top_uploads:
+      title: "Кращі Завантаження"
       labels:
-        filename: Filename
+        filename: Ім’я файлу
+        extension: Розширення
+        author: Автор
+        filesize: Розмір файла
+      description: "Список всіх завантажень по розширенню, розміру файлу і автору."
+    top_ignored_users:
+      title: "Топ ігнорованих / приглушених користувачів"
+      labels:
+        ignored_user: Ігнорований користувач
+        ignores_count: Проігноровано
+        mutes_count: Приглушено
+      description: "Користувачі, які були відключені та/або проігноровані іншими користувачами."
   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."
+    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."
+    subfolder_ends_in_slash: "Неправильно налаштована ваша папка; DISCOURSE_RELATIVE_URL_ROOT закінчується косою рискою."
+    missing_mailgun_api_key: "Сервер налаштований для надсилання електронної пошти через Mailgun, але ви не надали ключ API, який використовується для перевірки повідомлень webhook."
+    bad_favicon_url: "Фавікон не завантажується. Перевірте налаштування Фавікон в <a href='%{base_path}/admin/site_settings'>налаштуваннях сайту</a>."
+    out_of_date_themes: "Оновлення доступні для таких тем:"
+    unreachable_themes: "Нам не вдалося перевірити наявність оновлень за наступними темами:"
   site_settings:
-    allow_user_locale: "Allow users to choose their own language interface preference"
+    censored_words: "Слова, які будуть автоматично замінені на &#9632;&#9632;&#9632;&#9632;"
+    delete_old_hidden_posts: "Автоматично видаляти повідомлення, приховані довше ніж 30 днів."
+    allow_user_locale: "Дозволяти користувачам вибирати мову інтерфейсу"
+    set_locale_from_accept_language_header: "встановити мову інтерфейсу для анонімних користувачів з мовних заголовків їх веб-браузера. (ЕКСПЕРИМЕНТАЛЬНО, не працює з анонімним кешем)"
+    support_mixed_text_direction: "Підтримка змішаних напрямків тексту зліва направо і справа наліво."
+    min_post_length: "Мінімально допустима кількість символів в одному повідомленні."
+    min_first_post_length: "Мінімально допустима кількість символів в першому повідомленні (або в тексті теми)"
+    min_personal_message_post_length: "Мінімально допустима кількість символів в повідомленні в бесіді."
+    max_post_length: "Максимально допустима кількість символів в одному повідомленні."
+    topic_featured_link_enabled: "Дозволити публікувати посилання з темами."
+    show_topic_featured_link_in_digest: "Показати посилання на тему в e-mail дайджесті."
+    min_topic_title_length: "Мінімально допустима кількість символів в назві теми."
+    max_topic_title_length: "Максимально допустима кількість символів в назві теми."
+    min_personal_message_title_length: "Мінімально допустима кількість символів в заголовку повідомлення в бесіді."
+    max_emojis_in_title: "Максимально допустимі смайлики в заголовку теми"
     min_search_term_length: "Мінімальна дозволена довжина пошукової фрази у символах"
+    search_tokenize_chinese_japanese_korean: "Примусовий пошук для токенізації Китайського / Японського / Корейського навіть на сайтах, відмінних від CJK"
+    search_prefer_recent_posts: "Якщо пошук на великому форумі виконується повільно, цей параметр спочатку намагається більше індексувати останні повідомлення"
+    search_recent_posts_size: "Скільки останніх постів зберегти в індексі"
+    log_search_queries: "Журнал пошукових запитів, виконаних користувачами"
+    search_query_log_max_size: "Максимальна кількість пошукових запитів для зберігання"
+    search_query_log_max_retention_days: "Максимальна кількість часу для зберігання пошукових запитів, в днях."
+    search_ignore_accents: "Ігнорувати акценти при пошуку тексту."
+    category_search_priority_very_low_weight: "Вага застосовується до ранжирування для дуже низького пріоритету пошуку категорії."
+    category_search_priority_low_weight: "Вага застосовується до ранжирування для низького пріоритету пошуку категорії."
+    category_search_priority_high_weight: "Вага, застосована до ранжирування для високого пріоритету пошуку категорії."
+    category_search_priority_very_high_weight: "Вага застосовується до ранжирування для дуже високого пріоритету пошуку категорії."
+    allow_uncategorized_topics: "Дозволити створення тем без категорії. УВАГА: Якщо є які-небудь теми без категорії, ви повинні перекласифікувати їх, перш ніж відключити."
     allow_duplicate_topic_titles: "Дозволити теми з однаковими, дублюючими назвами."
-    unique_posts_mins: "How many minutes before a user can make a post with the same content again"
-    crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини і висоти."
-    email_custom_headers: "Список заголовків електронної пошти, розділених вертикальною рискою"
-    enable_long_polling: "Message bus used for notification can use long polling"
-    anon_polling_interval: "How often should anonymous clients poll in milliseconds"
+    unique_posts_mins: "Кількість хвилин, перш ніж користувач зможе знову написати допис з тим самим вмістом"
+    educate_until_posts: "Кількість перших повідомлень нових користувачів, для яких потрібно показувати нескладну підказку з порадами для новачків."
+    title: "Назва цього сайту. Буде додано в HTML-тег title."
+    site_description: "Опишіть сайт одним реченням, для використання опису в мета-тег description."
+    short_site_description: "Короткий опис, що використовується в тезі заголовка на головній сторінці"
+    contact_email: "E-mail адреса ключової контактної особи, відповідальної за цей сайт. Використовується для критичних повідомлень, або термінові звернення через контактну форму на сторінці <a href='%{base_path}/about' target='_blank'>/about</a>."
+    contact_url: "Контактний URL цього сайту. Використовується на сторінці <a href='%{base_path}/about' target='_blank'>/about</a> для термінових питань."
+    crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини та висоти."
+    download_remote_images_to_local: "Завантажувати картинки, вставлені в повідомлення посиланнями на інші сайти, і зберігати їх локально, щоб запобігти їх зміни або втрату."
+    download_remote_images_threshold: "Мінімальне доступне місце на диску (у відсотках), при якому дозволено автоматичне скачування картинок для локального зберігання."
+    download_remote_images_max_days_old: "Не завантажувати віддалені зображення для повідомлень, які старше n днів."
+    disabled_image_download_domains: "Список доменів, розділений знаком \"|\", в яких не потрібно завантажувати картинки."
+    editing_grace_period: "Кількість секунд після відправки соощенія, в перебігу яких правка повідомлення не буде записуватися в історії редагувань."
+    editing_grace_period_max_diff: "Максимальна кількість змін символів, дозволених в пільговому періоді редагування, якщо більше змін збереже іншу редакцію поста (рівень довіри 0 і 1)"
+    editing_grace_period_max_diff_high_trust: "Максимальна кількість змін символів, дозволених в пільговому періоді редагування, якщо більше змін збереже іншу редакцію поста (рівень довіри 2 і вище)"
+    staff_edit_locks_post: "Дописи будуть заблоковані для редагування, якщо вони редагуються персоналом"
+    post_edit_time_limit: "Автор tl0 або tl1 може редагувати свою публікацію протягом (n) хвилин після публікації. Встановіть 0 назавжди."
+    tl2_post_edit_time_limit: "Автор tl2+ може редагувати свою публікацію протягом (n) хвилин після публікації. Встановіть 0 назавжди."
+    edit_history_visible_to_public: "Дозволити звичайним користувачам переглядати старі версії повідомлень. Якщо виключено, історія редакцій буде видима тільки персоналу."
+    delete_removed_posts_after: "Повідомлення, яке було видалено автором, буде автоматично видалено через (n) годин. Якщо встановлено 0, то повідомлення буде видалено негайно."
+    max_image_width: "Максимальная ширина ескізів картинок, що показуються в дописах"
+    max_image_height: "Максимальная висота ескізів картинок, що показуються в дописах"
+    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: "Перелік доменів, у яких без перегляду не слід додавати посилання. example.com також автоматично дозволить sub.example.com. Як мінімум, слід додати домен цього веб-сайту, щоб допомогти веб-сканерам знайти весь вміст. Якщо інші частини вашого веб-сайту знаходяться в інших доменах, додайте їх також."
+    post_excerpt_maxlength: "Максимальна довжина короткого викладу допису."
+    show_pinned_excerpt_mobile: "Показати короткий виклад по закріплених темах в мобільному поданні."
+    show_pinned_excerpt_desktop: "Показати витримку по закріплених темах в режимі робочого столу."
+    post_onebox_maxlength: "Максимальна довжина повідомлення з форуму Discourse в режимі розумної вставки."
+    onebox_domains_blacklist: "Список доменів, які ніколи не будуть в oneboxed."
+    inline_onebox_domains_whitelist: "Список доменів, які будуть в oneboxed в мініатюрному вигляді, якщо вони пов'язані без заголовка."
+    enable_inline_onebox_on_all_domains: "Нехтувати inline_onebox_domain_whitelist налаштуваннями сайту і дозволити вбудовування onebox на всіх доменах."
+    max_oneboxes_per_post: "Максимальна кількість oneboxes в повідомленні."
+    logo: "Зображення логотипу в лівому верхньому кутку вашого сайту. Використовуйте широке прямокутне зображення висотою 120 і співвідношенням сторін більше 3:1. Якщо залишити поле порожнім, буде показаний текст заголовка сайту."
+    logo_small: "Невелике зображення логотипу в лівому верхньому кутку вашого сайту, видно при прокручуванні вниз. Використовуйте квадратне зображення 120×120. Якщо залишити порожнім, буде показаний домашній гліф."
+    digest_logo: "Альтернативне зображення логотипу, що використовується у верхній частині e-mail пошти вашого сайту. Використовуйте зображення широкого прямокутника. Не використовуйте SVG-образ. Якщо залишити порожнім, буде використовуватися зображення з налаштування `логотип`."
+    mobile_logo: "Логотип використовується на мобільній версії вашого сайту. Використовуйте широке прямокутне зображення з висотою 120 і співвідношенням сторін більше 3:1. Якщо залишити порожнім, буде використано зображення з налаштування `логотип`."
+    large_icon: "Зображення використовується в якості основи для інших значків метаданих. В ідеалі має бути більше 512 х 512. Якщо залишити поле порожнім, буде використовуватися logo_small."
+    manifest_icon: "Зображення використовується в якості логотипу / заставки на Android. Буде автоматично змінено до 512 × 512. Якщо залишити порожнім, буде використовуватися large_icon."
+    favicon: "Фавікон для вашого сайта, див. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.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 card 'summary large image' (повинно бути не менше 280 в ширину і не менше 150 у висоту). Якщо залишити порожнім, метадані звичайної картинки генеруються з використанням opengraph_image."
+    notification_email: "Відправник: E-mail використовується при відправленні всіх системних листів. Домен, вказаний тут повинен мати правильно сконфігуровані SPF, DKIM і reverse PTR записи, для успішного відправлення."
+    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>"
+    enforce_second_factor: "Змушує користувачів включити двохфакторную перевірку справжності. Виберіть 'всі', щоб застосувати його до всіх користувачів. Виберіть 'персонал', щоб примусово застосовувати його тільки до співробітників."
+    summary_score_threshold: "Мінімальна оцінка повідомлення, необхідна для його включення в зведення по темі"
+    summary_posts_required: "Мінімальна кількість повідомлень в темі для активації кнопки \"Зведення по темі\""
+    summary_likes_required: "Мінімальна кількість симпатій в темі для активації кнопки \"Зведення по темі\""
+    summary_percent_filter: "При натисканні на кнопку \"Зведення по темі\", показувати кращі % дописів"
+    summary_max_results: "Максимальна кількість повідомлень, що показуються в 'Зведенні по темі'"
+    enable_system_message_replies: "Дозволяє користувачам відповідати на системні повідомлення, навіть якщо приватні повідомлення відключені"
+    enable_long_polling: "Використовувати механізм long polling для повідомлень про події"
+    long_polling_base_url: "Базовий URL, використовуваний для long polling (при використанні CDN для роздачі динамічного контенту встановіть в цьому параметрі адресу origin pull), наприклад: http://origin.site.com"
+    long_polling_interval: "Час, який очікує сервер до відповіді клієнтам, коли немає даних для відправки (тільки для користувачів, які увійшли на сайт)"
+    polling_interval: "Якщо не використовується long polling, як часто слід авторизованим клієнтам опитувати сервер, в мілісекундах"
+    anon_polling_interval: "Як часто слід анонімним клієнтам опитувати сервер, в мілісекундах"
+    background_polling_interval: "Як часто слід клієнтам опитувати сервер, в мілісекундах (коли вікно знаходиться в фоновому режимі)"
+    hide_post_sensitivity: "Імовірність того, що позначений пост буде приховано"
+    silence_new_user_sensitivity: "Імовірність того, що новий користувач буде відключений на основі прапорів спаму"
+    auto_close_topic_sensitivity: "Імовірність того, що позначена тема буде автоматично закрита"
+    cooldown_minutes_after_hiding_posts: "Кількість хвилин, які повинен почекати користувач перед редагуванням повідомлення прихованого за скарги"
+    max_topics_in_first_day: "Максимальна кількість тем, які користувач може створити протягом 24 годин з моменту створення свого першого повідомлення"
+    max_replies_in_first_day: "Максимальна кількість відповідей, що користувач може зробити протягом 24 годин з моменту створення свого першого повідомлення"
+    tl2_additional_likes_per_day_multiplier: "Збільшити ліміт лайків на день для tl2 (member) до"
+    tl3_additional_likes_per_day_multiplier: "Збільшити ліміт лайків на день для tl3 (member) до"
+    tl4_additional_likes_per_day_multiplier: "Збільшити ліміт лайків на день для tl4 (leader) до"
+    num_users_to_silence_new_user: "Якщо повідомлення нового користувача отримують більше прапорів спаму ніж num_spam_flags_to_silence_new_user від багатьох різних користувачів, приховайте всі його публікації та запобігти подальшим публікаціям. 0 відключити."
+    num_tl3_flags_to_silence_new_user: "Якщо повідомлення нового користувача отримують більше прапорів від користувачів з 3 рівнем довіри ніж   num_tl3_users_to_silence_new_user, приховати усі його повідомлення та запобігти подальшим публікаціям. 0 відключити"
+    num_tl3_users_to_silence_new_user: "Якщо повідомлення нового користувача отримують прапорів бульше  num_tl3_flags_to_silence_new_user від багатьох різних користувачів з 3 рівнем довіри, приховати всі його дописи та запобігти подальшим публікаціям. 0 відключити."
+    notify_mods_when_user_silenced: "Якщо користувач автоматично блокується, надіслати повідомлення всім модераторам"
+    flag_sockpuppets: "Якщо новий користувач відповідає в тему з тієї ж IP-адреси, що і користувач, який розпочав цю тему, позначте обидва їх повідомлення як потенційний спам."
+    traditional_markdown_linebreaks: "Використовуйте стандартні можливості переносу рядків в Markdown: рядок повинен закінчуватись двома пробілами, щоб переноси рядків спрацювали."
+    enable_markdown_typographer: "Використовуйте правила типографіки для поліпшення читабельності тексту: замініть прямі лапки на фігурні лапки ’, (c) (tm) з символами, -- з emdash –, і т.ін."
+    enable_markdown_linkify: "Автоматично обробляти текст, який виглядає як посилання – як посилання: www.example.com та https://example.com будуть автоматично пов’язані"
+    markdown_linkify_tlds: "Список доменів верхнього рівня, які автоматично розглядаються як посилання"
+    markdown_typographer_quotation_marks: "Список подвійних та одиничних лапок змінювати парами"
+    post_undo_action_window_mins: "Кількість хвилин, за які користувачі зможуть скасувати останні дії в публікації (наприклад, вподобайки, скарги тощо)"
+    must_approve_users: "Персонал повинен схвалити всі нові облікові записи користувачів, перш ніж їм буде надано доступ до сайту"
+    pending_users_reminder_delay: "Повідомляти модераторів, якщо нові користувачі чекають схвалення довше ніж стільки годин. Встановіть -1 для відключення цих повідомлень."
+    maximum_session_age: "Користувач залишиться в системі протягом n годин з моменту останнього відвідування"
+    moderators_create_categories: "Дозволити модераторам створювати нові категорії"
+    cors_origins: "Дозволити origins для запитів CORS. Кожне origin повинне містити http:// або https://. Змінна DISCOURSE_ENABLE_CORS env повинна бути true, щоб увімкнути CORS."
+    use_admin_ip_whitelist: "Адміністратори зможуть увійти, лише якщо вони мають IP-адресу, визначену у списку екранованих IP-адрес (Admin > Логи > Екрановані IPs)."
+    blacklist_ip_blocks: "Список приватних блоків IP, які ніколи не слід сканувати Discourse"
+    whitelist_internal_hosts: "Список внутрішніх хостів, які дискурс може безпечно сканувати для oneboxing та інших цілей"
+    allowed_iframes: "Список префіксів домену iframe src, які discourse може безпечно дозволити в повідомленнях"
+    whitelisted_crawler_user_agents: "Користувацькі агенти веб-сканерів, яким слід дозволити доступ до сайту. УВАГА! ВСТАНОВЛЕННЯ ЦЬОГО ПАРАМЕТРА ВІДКЛЮЧИТЬ ВСІХ ПОШУКОВИХ РОБОТІВ, ЩО НЕ ЗАЗНАЧЕНІ ТУТ!"
+    blacklisted_crawler_user_agents: "Унікальне слово, нечутливе до регистру, в рядку агента користувача, що ідентифікує веб-сканери, яким не можна дозволяти отримувати доступ до сайту. Не застосовується, якщо активовано білий список"
+    slow_down_crawler_user_agents: "Користувацькі агенти веб-сканерів, які повинні бути обмежені в robots.txt, використовуючи директиву Crawl-delay"
+    slow_down_crawler_rate: "Якщо вказано slow_down_crawler_user_agents, ця пауза  застосовуватиметься до всіх сканерів (затримка між запитами кількість секунд)"
+    content_security_policy: "Увімкнути політику безпеки вмісту"
+    content_security_policy_report_only: "Увімкнути тільки звіт про політику безпеки вмісту"
+    content_security_policy_collect_reports: "Увімкнути збір звітів про порушення CSP на /csp_reports"
+    content_security_policy_script_src: "Додаткові джерела скриптів у списку. Поточний хост і CDN включено за замовчуванням"
+    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: "Всі автоматичні повідомлення будуть відправлятися від імені цього користувача. Якщо залишити порожнім, то буде використаний системний користувач за замовчуванням - System."
+    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_when_quoting: "Не показувати розгортаємий блок \"у відповідь на\", якщо повідомлення вже містить цитату."
+    max_reply_history: "Максимальне число розгортаються відповідей в блоці \"у відповідь на\""
+    topics_per_period_in_top_summary: "Кількість рекомендованих тем, що відображаються внизу поточної теми."
+    topics_per_period_in_top_page: "Кількість рекомендованих тем, що відображаються при натисканні 'Показати більше' в низу поточної теми."
+    redirect_users_to_top_page: "Автоматично перенаправляти нових і давно відсутніх користувачів до початку сторінки."
+    top_page_default_timeframe: "Часові рамки за замовчуванням для сторінки TOP."
+    moderators_view_emails: "Дозволити модераторам переглядати повідомлення e-mails користувачів"
+    prioritize_username_in_ux: "Показуйте спершу псевдонім на сторінці користувача, картці користувача та публікаціях (коли вимкнене ім’я показувати першим)"
+    enable_rich_text_paste: "Увімкнути автоматичне перетворення HTML в Markdown при вставці тексту в композитор. (Експериментальний)"
+    email_token_valid_hours: "Посилання на відновлення пароля / активацію облікового запису буде діяти протягом (n) годин."
+    enable_badges: "Увімкнути систему нагород"
+    enable_whispers: "Дозволити персоналу особисте спілкування в рамках теми."
+    email_domains_blacklist: "Список поштових доменів, з яких заборонена реєстрація облікових записів. приклад: mailinator.com trashmail.net"
+    email_domains_whitelist: "Список поштових доменів, з яких ПОВИННА проводитися реєстрація облікових записів.\nУВАГА: якщо ви користувач іншого поштового домену – вам реєстрація буде недоступна."
+    hide_email_address_taken: "Не повідомляти користувачам, що обліковий запис існує з даною адресою E-mail пошти під час реєстрації та з форми відновлення пароля."
+    log_out_strict: "Коли користувач виходить з системи, закривати всі сесії на всіх пристроях користувача."
+    version_checks: "Перевірити оновлення на Discourse Hub для отримання повідомлень про нові версії та відображення їх в <a href='%{base_path}/admin' target='_blank'>/admin</a> панелі"
+    new_version_emails: "Відправляти повідомлення на адресу contact_email коли будуть доступні нові версії."
     invite_expiry_days: "Скільки днів ключі запрошення користувачів лишаються чинними"
+    invite_only: "Усі зареєстровані облікові записи повинні бути явно запрошені довіреними користувачами або співробітниками. Публічна реєстрація відключена."
+    login_required: "Вимагати авторизацію для доступу до сайту, анонімний доступ заборонити."
+    min_username_length: "Мінімальна довжина імені користувача у символах. ПОПЕРЕДЖЕННЯ: якщо будь-які існуючі користувачі або групи мають імена, коротші за це, ваш САЙТ ЗЛАМАЄТЬСЯ!"
+    max_username_length: "Максимальна довжина імені користувача у символах. ПОПЕРЕДЖЕННЯ: якщо будь-які існуючі користувачі або групи мають імена, довші за це, ваш САЙТ ЗЛАМАЄТЬСЯ!"
+    unicode_usernames: "Дозволити іменам користувачів та іменам груп містити літери та цифри Unicode."
+    unicode_username_character_whitelist: "Регулярний вираз, щоб дозволити лише деякі символи Unicode в межах імен користувачів. Букви та цифри ASCII завжди будуть дозволені і їх не потрібно включати у білий список"
+    reserved_usernames: "Імена користувачів, для яких реєстрація заборонена. Символ підстановки * може використовуватися для узгодження будь-якого символу з нулем або більше разів."
     min_password_length: "Мінімальна довжина пароля."
-    maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted"
-    s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
-    active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
-    previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
-    clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
-    purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
+    min_admin_password_length: "Мінімальна довжина пароля для адміністратора."
+    password_unique_characters: "Мінімальна довжина пароля для адміністратора."
+    block_common_passwords: "Не дозволяти використовувати паролі зі списку 10 000 самих часто використовуваних паролів."
+    enable_sso: "Увімкніть єдиний вхід через зовнішній сайт (УВАГА: ПОШТОВІ АДРЕСИ КОРИСТУВАЧІВ *ПОВИННІ* бути перевірені ЗОВНІШНІМ САЙТОМ!)"
+    sso_secret: "Секретний набір символів, який використовується для перевірки автентичності зашифрованого входу за допомогою SSO, переконайтеся, що це 10 або більше символів"
+    sso_provider_secrets: "Перелік доменно-секретних пар, які використовують дискурс як постачальник SSO. Переконайтеся, що секрет SSO становить 10 символів або більше. Символ підстановки * може використовуватися для відповідності будь-якому домену або лише його частині (наприклад, * .example.com)"
+    sso_overrides_bio: "Перезаписує інформацію в профіль користувача і не дозволяє користувачеві його змінювати"
+    sso_overrides_groups: "Синхронізуйте все членство в групі вручну з групами, вказаними в атрибуті sso груп (ПОПЕРЕДЖЕННЯ: якщо ви не вказали групи, все ручне членство в групі буде видалено для користувача)"
+    sso_overrides_email: "Перезаписує локальну електронну пошту на електронну пошту зовнішнього сайту з завантаженням SSO на кожному вході та запобігає локальним змінам. (ПОПЕРЕДЖЕННЯ: розбіжності можуть виникнути через нормалізацію локальної електронної пошти)"
+    sso_overrides_username: "Перезаписує локальне ім'я користувача на ім'я зовнішнього сайту з завантаженням SSO на кожному вході та запобігає локальним змінам. (ПОПЕРЕДЖЕННЯ: розбіжності можуть виникнути через різницю в довжині / вимогах імені користувача)"
+    sso_not_approved_url: "Перенаправляти непідтверджені SSO-аккаунти на цю URL-адресу"
+    enable_local_logins_via_email: "Дозволити користувачам запитувати посилання для входу в один клік та надсилати їм електронною поштою цього посилання."
+    allow_new_registrations: "Дозволити реєстрацію нових користувачів. Вимкніть, щоб заборонити відвідувачам створювати нові облікові записи."
+    enable_signup_cta: "Покажіть повідомлення анонімним користувачам, які повернулися, з пропозицією зареєструвати обліковий запис."
+    google_oauth2_client_id: "Client ID для вашого Google додатка."
+    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: "Включати режим \"тільки для читання\" під час виконання резервного копіювання"
+    enable_backups: "Дозволити адміністраторам створювати резервні копії форуму"
+    allow_restore: "Дозволити імпорт, який може замінити ВСІ дані сайту. Залиште вимкненим, якщо не плануєте відновлювати резервну копію"
+    maximum_backups: "Максимальна кількість резервних копій для зберігання на диску. Старіші резервні копії автоматично видаляються"
+    automatic_backups_enabled: "Запускайте автоматичні резервні копії, як визначено в частоті резервного копіювання"
+    backup_frequency: "Кількість днів між резервними копіями."
+    s3_backup_bucket: "Адреса папки віддаленого сервера для резервних копій. УВАГА: Переконайтеся, що місце призначення захищено від сторонніх."
+    s3_endpoint: "Кінцеву точку можна змінити для резервного копіювання на службу, сумісну з S3, наприклад DigitalOcean Spaces або Minio. УВАГА: Не використовуйте AWS S3."
+    s3_disable_cleanup: "Вимкнути видалення резервних копій з S3, коли їх видалити локально."
+    backup_time_of_day: "Час доби UTC, коли має відбуватися резервне копіювання"
+    backup_with_uploads: "Додайте завантаження до запланованих резервних копій. Якщо вимкнути це, ви можете створити резервну копію бази даних."
+    backup_gzip_compression_level_for_uploads: "Рівень стиснення Gzip, який використовується для стискання завантажень."
+    include_thumbnails_in_backups: "Включіть створені ескізи в резервні копії. Якщо вимкнути цю функцію, резервні копії зменшаться, але потрібно буде перебудувати (rebake) всі повідомлення після відновлення."
+    active_user_rate_limit_secs: "Як часто ми оновлюємо 'last_seen_at' поле, в секундах"
+    verbose_localization: "Показувати ключі використовуваних рядків в інтерфейсі для перекладу на іншу мову"
+    previous_visit_timeout_hours: "Скільки часу триває візит, перш ніж ми вважатимемо це 'попереднім' візитом, в годинах"
+    rebake_old_posts_count: "Кількість старих дописів, які потрібно перевіряти кожні 15 хвилин."
+    enable_safe_mode: "Дозволити користувачам входити в безпечний режим для налагодження плагінів."
+    rate_limit_create_topic: "Користувачі не можуть створювати більше однієї нової теми за вказаний час, в секундах."
+    rate_limit_create_post: "Користувачі не можуть писати більше одного нового допису за вказаний час, в секундах."
+    rate_limit_new_user_create_topic: "Користувачі не можуть створювати більше однієї нової теми за вказаний час, в секундах."
+    rate_limit_new_user_create_post: "Користувачі не можуть писати більше одного нового допису за вказаний час, в секундах."
+    max_likes_per_day: "Максимальна кількість лайків, які користувач може поставити за один день."
+    max_flags_per_day: "Максимальна кількість поданих скарг користувачем за день."
+    max_bookmarks_per_day: "Максимальна кількість створених закладок користувачем за день."
+    max_edits_per_day: "Максимальна кількість редагувань користувачем за день."
+    max_topics_per_day: "Максимальна кількість тем, які користувач може створити за один день."
+    max_personal_messages_per_day: "Максимальна кількість тем, які користувач може створити за один день."
+    max_invites_per_day: "Максимальна кількість запрошень, яке може відправити користувач за один день."
+    max_topic_invitations_per_day: "Максимальна кількість запрошень в тему, яке може відправити користувач протягом дня."
+    max_logins_per_ip_per_hour: "Максимальна кількість входів в систему на IP-адресу за годину"
+    max_logins_per_ip_per_minute: "Максимальна кількість входів в систему на IP-адресу за годину"
+    max_post_deletions_per_minute: "Максимальна кількість записів, які користувач може видалити за хвилину."
+    max_post_deletions_per_day: "Максимальна кількість записів, які користувач може видалити за день."
+    alert_admins_if_errors_per_minute: "Кількість помилок на хвилину для попередження адміністратора. Значення 0 відключає цю опцію. УВАГА: потрібне перезавантаження."
+    alert_admins_if_errors_per_hour: "Кількість помилок на годину для попередження адміністратора. Значення 0 відключає цю опцію. УВАГА: потрібне перезавантаження."
+    categories_topics: "Кількість тем, що відображаються на сторінці розділів."
+    suggested_topics: "Кількість рекомендованих тем, що відображаються внизу поточної тем."
+    limit_suggested_to_category: "Показувати тільки теми з поточного розділу в списку рекомендованих тем."
+    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_unactivated_users_grace_period_days: "Пільговий період (у днях) користувачу, який не активував свій акаунт, до того як його запис буде видалено. Встановіть 0, щоб ніколи не очищати неактивованих користувачів."
+    enable_s3_uploads: "Розміщувати завантаження на Amazon S3. ВАЖЛИВО: потрібно правильні настройки S3 (access key id и secret access key)."
+    s3_upload_bucket: "Ім'я Amazon S3 bucket куди будуть завантажуватися файли. УВАГА: має бути в нижньому регістрі, без пробілів, без підкреслень.\nhttp://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
+    avatar_sizes: "Список автоматически сгенерированных размеров аватар."
+    external_system_avatars_enabled: "Використовуйте зовнішню систему аватарів."
+    external_system_avatars_url: "URL-адреса служби системи зовнішніх аватарів. Дозволені заміни {username} {first_letter} {color} {size}"
+    restrict_letter_avatar_colors: "Список шестизначних hex значень кольорів, які будуть використані для фону аватара з літерою."
+    selectable_avatars_enabled: "Змусити користувачів вибирати аватар зі списку."
+    selectable_avatars: "Список аватарів, які користувачі можуть вибирати."
+    allow_all_attachments_for_group_messages: "Дозволити всі поштові вкладення для групових повідомлень."
+    png_to_jpg_quality: "Якість конвертованого файлу JPG (1 - найнижча якість, 99 - найкраща якість, 100 - відключити)."
+    allow_staff_to_upload_any_file_in_pm: "Дозволити співробітникам завантажувати будь-які файли в PM."
+    strip_image_metadata: "Очищувати метадані зображення"
+    min_ratio_to_crop: "Коефіцієнт, що використовується для обрізання високих зображень. Введіть відношення ширини / висоти."
+    simultaneous_uploads: "Максимальна кількість файлів, які можна перетягнути та впустити у композитор"
+    enable_flash_video_onebox: "Дозволити розумну вставку посилань sqf і flv (Adobe Flash). УВАГА: підвищує ризики безпеки сайту."
+    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."
+    tl2_requires_topics_entered: "У скількох темах користувач повинен побувати для просування до рівня довіри 2."
+    tl2_requires_read_posts: "Скільки повідомлень користувач повинен прочитати для просування до рівня довіри 2."
+    tl2_requires_time_spent_mins: "Скільки хвилин користувач повинен читати повідомлення на форумі для просування до рівня довіри 2."
+    tl2_requires_days_visited: "Скільки днів користувач повинен відвідувати сайт для просування до рівня довіри 2."
+    tl2_requires_likes_received: "Скільки симпатій користувач повинен отримати для просування до рівня довіри 2."
+    tl2_requires_likes_given: "Скільки симпатій користувач повинен висловити для просування до рівня довіри 2."
+    tl2_requires_topic_reply_count: "У скількох темах користувач повинен відповісти для просування до рівня довіри 2."
+    tl3_time_period: "Період часу необхідний для Рівня довіри 3 (в днях)"
+    tl3_requires_days_visited: "Мінімальна кількість днів, які користувачеві потрібно відвідати сайт протягом останніх (tl3 time period) днів, щоб отримати право на просування до рівня довіри 3. Встановіть більший за часовий період tl3, щоб вимкнути просування до tl3. (0 або вище)"
+    tl3_requires_topics_replied_to: "Мінімальна кількість тем, на які користувач повинен відповісти протягом останніх (tl3 time period) днів, щоб отримати право на просування до рівня довіри 3. (0 або вище)"
+    tl3_requires_topics_viewed: "Який відсоток створених тем за останні (період часу tl3) днів повинен мати користувач для підвищення рівня довіри до 3. (від 0 до 100)"
+    tl3_requires_topics_viewed_cap: "Максимально необхідну кількість тем, що переглядаються за останні (період часу tl3) днів."
+    tl3_requires_posts_read: "Який відсоток створених повідомлень за останні (період часу tl3) днів повинен мати користувач для підвищення рівня довіри до 3. (від 0 до 100)"
+    tl3_requires_posts_read_cap: "Максимально необхідну кількість постів, прочитаних за останні (період часу tl3) днів."
+    tl3_requires_topics_viewed_all_time: "Скільки повідомлень користувач повинен прочитати для підняття рівня довіри до 3."
+    tl3_requires_posts_read_all_time: "Скільки повідомлень користувач повинен прочитати для підняття рівня довіри до 3."
+    tl3_requires_max_flagged: "У користувача повинно бути не більше X повідомлень, позначених X різними користувачами за останні (період часу tl3) дні, щоб претендувати на підвищення до рівня довіри 3, де X - це значення цього параметра. (0 або вище)"
+    tl3_promotion_min_duration: "Мінімальна кількість днів, протягом яких користувач з рівнем довіри 3 не може бути знижений до рівня довіри 2."
+    tl3_requires_likes_given: "Мінімальна кількість лайків, яке необхідно дати в останні (період часу tl3) дні, щоб отримати право на підвищення до Рівня довіри 3."
+    tl3_requires_likes_received: "Мінімальна кількість лайків, який повинен бути одержаний за останні (період часу tl3) дні, щоб претендувати на підвищення до Рівня довіри 3."
+    tl3_links_no_follow: "Не видаляти rel=nofollow з посилань від користувачів з рівнем довіри 3."
+    trusted_users_can_edit_others: "Дозволити користувачам з високим рівнем довіри редагувати контент інших користувачів."
     min_trust_to_create_topic: "Мінімальний рівень довіри, необхідний для створення нової теми."
-    newuser_max_attachments: "Скільки прикріплень новий користувач може додати до допису."
+    allow_flagging_staff: "Якщо включено, користувачі можуть позначати (скаржитися) на повідомлення (пости) персоналу."
+    min_trust_to_edit_wiki_post: "Мінімальний рівень довіри, необхідний для редагування вікі-повідомлення."
+    min_trust_to_edit_post: "Мінімальний рівень довіри, необхідний для редагування повідомлень."
+    min_trust_to_allow_self_wiki: "Мінімальний рівень довіри, необхідний для створення свого вікі-повідомлення."
+    min_trust_to_send_messages: "Мінімальний рівень довіри, необхідний для створення нових особистих повідомлень."
+    min_trust_to_flag_posts: "Мінімальний рівень довіри, необхідний для розміщення дописів"
+    min_trust_to_post_links: "Мінімальний рівень довіри, необхідний для включення посилань у допис"
+    min_trust_to_post_images: "Мінімальний рівень довіри, необхідний для включення зображень у допис"
+    whitelisted_link_domains: "Домени, на які користувачі можуть посилатися, навіть якщо вони не мають відповідного рівня довіри для розміщення посилань"
+    newuser_max_links: "Скільки посилань новий користувач може вставляти в повідомлення."
+    newuser_max_images: "Скільки зображень новий користувач може вставляти в одне повідомлення."
+    newuser_max_attachments: "Скільки вкладень новий користувач може додати до допису."
+    newuser_max_mentions_per_post: "Максимальне число згадок інших користувачів (@name), яке новий користувач може зробити в одному повідомленні."
+    newuser_max_replies_per_topic: "Максимальна кількість відповідей нового користувача в одній темі до того, як хто-небудь напише відповідь."
+    max_mentions_per_post: "Максимальна кількість згадок по @псевдоніму одним користувачем в одному повідомленні."
+    max_users_notified_per_group_mention: "Максимальна кількість користувачів, які можуть отримати сповіщення, якщо згадується група (якщо поріг досягнуто, сповіщення не буде підвищено)"
+    enable_mentions: "Дозволити користувачам згадувати інших користувачів."
+    create_thumbnails: "Створювати мініатюри занадто великих картинок в повідомленнях, показувати великі оригінали в окремому вікні."
+    email_time_window_mins: "Почекати (n) хвилин перед відсиланням будь-яких повідомлень поштою, щоб дати автору можливість перечитати і відредагувати своє повідомлення."
+    personal_email_time_window_seconds: "Зачекайте (n) секунд, перш ніж надсилати будь-які електронні листи із повідомленнями, щоб користувачі мали змогу редагувати та доопрацьовувати свої повідомлення."
+    email_posts_context: "Скільки попередніх відповідей включати для контексту в повідомлення по e-mail."
+    flush_timings_secs: "Як часто ми відправляємо тимчасові дані на сервер, в секундах"
+    title_max_word_length: "Максимальна довжина слів в назві теми."
+    title_min_entropy: "Мінімальна ентропія, необхідна для назви теми. Ентропія - кількість унікальних символів, причому деякі літери кирилиці можуть вважатися за 2 символи, а не за 1, як англійські)."
+    body_min_entropy: "Мінімальна ентропія, необхідна для текста теми. Ентропія - кількість унікальних символів, причому деякі літери кирилиці можуть вважатися за 2 символи, а не за 1, як англійські)."
+    allow_uppercase_posts: "Дозволити всі великі літери в заголовку теми або в темі допису."
+    max_consecutive_replies: "Кількість дописів, які користувач повинен зробити підряд у темі, перш ніж він вже не зможе додати ще одну відповідь."
+    min_title_similar_length: "Мінімальна довжина назви теми, при якій вона буде перевірена на наявність схожих."
+    desktop_category_page_style: "Візуальний стиль для сторінки категорії."
+    category_colors: "Список шістнадцятирічних кодів кольорів, дозволених для категорій."
+    category_style: "Стилі для виділення розділів."
+    max_image_size_kb: "Максимальний розмір завантажуваних картинок в кілобайтах. Переконайтеся, що ви також налаштували обмеження в nginx (client_max_body_size) / apache або проксі."
+    max_attachment_size_kb: "Максимальний розмір завантажуваних файлів в кілобайтах. Переконайтеся, що ви також налаштували обмеження в nginx (client_max_body_size) / apache або проксі."
+    authorized_extensions: "Список розширень файлів, дозволених до завантаження. Використовуйте '*', щоб дозволити будь-які типи файлів."
+    authorized_extensions_for_staff: "Список розширень файлів, дозволених для завантаження для користувачів персоналу на додатково до списку, визначеного в налаштуваннях сайту як `authorized_extensions`. (використовувати &quot;*&quot;, щоб увімкнути всі типи файлів)"
+    theme_authorized_extensions: "Список розширень файлів, дозволених для завантаження в темі (використовуйте &quot;*&quot;, щоб увімкнути всі типи файлів)"
+    max_similar_results: "Кількість схожих тим, що показуються користувачеві під час створення нової теми. Порівняння виконується на підставі назви і тексту теми."
+    max_image_megapixels: "Максимально допустима кількість мегапікселів для зображення."
     title_prettify: "Запобігати типовим опискам та помилкам, таким як: всі літери - великі, перша літера - мала, багаторазові ! та ?, надлишкові . в кінці, тощо."
-    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."
+    title_remove_extraneous_space: "Видаліть початкові пробіли перед кінцевою пунктуацією."
+    automatic_topic_heat_values: 'Автоматично оновлювати параметри "topic views heat" та "topic post like heat" на основі активності сайту.'
+    topic_views_heat_low: "Після цієї кількості переглядів, поле переглядів злегка підсвічується."
+    topic_views_heat_medium: "Після цієї кількості переглядів, поле переглядів помірно підсвічується."
+    topic_views_heat_high: "Після цієї кількості переглядів, поле переглядів помітно підсвічується."
+    cold_age_days_low: "Кількість днів по закінченню яких, дата останньої активності в топіку стане трохи тьмяніше."
+    cold_age_days_medium: "Кількість днів по закінченню яких, дата останньої активності в топіку стане значно тьмяніше."
+    cold_age_days_high: "Кількість днів по закінченню яких, дата останньої активності в топіку стане зовсім тьмяною."
+    history_hours_low: "Кількість годин по закінченню яких, позначка про редагування даного допису буде злегка підсвічена."
+    history_hours_medium: "Кількість годин по закінченню яких, позначка про редагування даного допису буде підсвічена сильніше."
+    history_hours_high: "Кількість годин по закінченню яких, позначка про редагування даного поста буде сильно підсвічена. "
+    topic_post_like_heat_low: "Кількість лайків likes:post після якого лічильник поста буде злегка підсвічений."
+    topic_post_like_heat_medium: "Кількість лайків likes:post після якого лічильник поста буде сильніше підсвічений."
+    topic_post_like_heat_high: "Кількість лайків likes:post після якого лічильник поста буде сильно підсвічений."
+    faq_url: "Вкажіть повний URL на сторінку FAQ, якщо хочете використовувати власну версію."
+    tos_url: "Якщо ви хочете використовувати документ Загальні положення та умови, завантажений на інший сервер, то введіть посилання на нього."
+    privacy_policy_url: "Якщо ви хочете використовувати документ Privacy policy, завантажений на інший сервер, то введіть посилання на нього."
+    log_anonymizer_details: "Чи слід зберігати дані користувача в журналі після анонімізації. При дотриманні GDPR вам потрібно буде відключити це."
+    newuser_spam_host_threshold: "Скільки разів новий користувач може опублікувати посилання на той самий хост у своїх публікаціях `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: "При перевірці листа на спам, яка кількість символів має бути різною"
+    max_new_accounts_per_registration_ip: "Якщо з цієї IP-адреси вже є (n) облікових записів рівня довіри 0 (і жоден не є співробітником або рівня TL2 або вище), припиняти приймати нові реєстрації з цієї IP."
+    min_ban_entries_for_roll_up: "При натисканні кнопки &quot;Згорнути&quot; буде створено новий запис блокування підмережі, якщо є принаймні (N) записів."
+    max_age_unmatched_emails: "Видаляти невідповідні записи електронної пошти через (N) днів."
+    max_age_unmatched_ips: "Видаляти невідповідні IP-записи через (N) днів."
+    num_flaggers_to_close_topic: "Мінімальна кількість унікальних прапорів, необхідних для автоматичного призупинення теми для втручання"
+    num_hours_to_close_topic: "Кількість годин для призупинення теми для втручання."
+    auto_respond_to_flag_actions: "Увімкніть автоматичну відповідь, коли знімається прапор."
+    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: "Максимальний рівень довіри для автоматичного приглушення за швидкістю набору"
+    reviewable_default_topics: "Показувати дописи для перегляду, групуючи за темами за замовчуванням"
+    reviewable_default_visibility: "Не показуйте елементи для перегляду, якщо вони не відповідають цьому пріоритету"
+    reply_by_email_enabled: "Увімкнути відповіді на теми електронною поштою."
     reply_by_email_address: "Шаблон адреси електронної скриньки у формі для відповідей через електронну пошту, наприклад: %%{reply_key}@reply.myforum.com"
+    incoming_email_prefer_html: "Використовуйте HTML замість тексту для вхідної електронної пошти."
+    strip_incoming_email_lines: "Видаляти проміжні пробіли та пробіли з кожного рядка вхідних електронних листів."
+    disable_emails: "Захистити Discourse від надсилання будь-яких електронних листів. Виберіть &quot;так&quot;, щоб вимкнути електронні листи для всіх користувачів. Виберіть &quot;не персонал&quot;, щоб вимкнути електронні листи лише для користувачів, які не є персоналом."
+    strip_images_from_short_emails: "Видаляти зображення з електронних листів розміром менше 2800 байт"
+    short_email_length: "Найменший розмір електронних листів у байтах"
+    display_name_on_email_from: "Відображати повні імена в Email з полів"
+    unsubscribe_via_email: "Дозволити користувачам скасовувати підписку на електронні листи, надіславши електронний лист із 'unsubscribe' в темі чи тілі листа"
+    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, щоб відключити обмеження"
+    enable_staged_users: "Автоматично створювати поетапних користувачів під час обробки вхідних електронних листів."
+    maximum_staged_users_per_email: "Максимальна кількість поетапних користувачів, створених під час обробки вхідного електронного листа."
+    auto_generated_whitelist: "Список електронних адрес, які не перевірятимуться на автоматично створений вміст. Приклад: foo@bar.com | discourse@bar.com"
+    block_auto_generated_emails: "Блокувати вхідні електронні листи, ідентифіковані як автоматично створені."
+    ignore_by_title: "Ігнорувати вхідні електронні листи на основі їх заголовку."
+    attachment_content_type_blacklist: "Список ключових слів, які використовуються для додавань у чорний список на основі типу вмісту."
+    attachment_filename_blacklist: "Список ключових слів, які використовуються для додавань у чорний список на основі назви файлу."
+    forwarded_emails_behaviour: "Як ставитись до пересланого електронного листа до Discourse"
+    always_show_trimmed_content: "Завжди показуйте обрізану частину вхідних електронних листів. ПОПЕРЕДЖЕННЯ: можуть бути показані Email адреси."
+    private_email: "Не включайте вміст публікацій чи тем в тему електронної пошти чи тіло електронної пошти. ПРИМІТКА: також вимикає дайджест листів."
+    email_total_attachment_size_limit_kb: "Максимальний загальний розмір файлів, доданих до вихідних електронних листів. Установіть 0, щоб вимкнути надсилання вкладень."
+    post_excerpts_in_emails: "В електронних листах з повідомленнями завжди надсилайте уривки замість повних публікацій"
+    raw_email_max_length: "Скільки символів слід зберігати для вхідної електронної пошти."
+    raw_rejected_email_max_length: "Скільки символів слід зберігати для відхилених вхідних електронних листів."
+    delete_rejected_email_after_days: "Видалити відхилені електронні листи старші ніж (n) днів."
+    manual_polling_enabled: "Відправляти електронні листи за допомогою API для відповідей на електронну пошту."
+    pop3_polling_enabled: "Опитування через POP3 для відповідей електронною поштою."
+    log_mail_processing_failures: "Журнал усіх помилок обробки електронної пошти в <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     email_in_min_trust: "Мінімальний рівень довіри, який потрібен користувачу для дозволу створювати нові теми через email. "
+    email_in_spam_header: "Заголовок електронної пошти для виявлення спаму."
+    email_prefix: "[Label], який використовується в темі електронних листів. За замовчуванням встановлено значення &quot;title&quot;, якщо воно явно не встановлено."
+    delete_user_max_post_age: "Не дозволяти видаляти користувачів, чия перша публікація старша (x) днів."
     delete_all_posts_max: "Максимальне число дописів, які можна видалити за один раз кнопкою \"Видалити всі дописи\". Якщо користувач має більше дописів, ніж це число, їх не можна буде видалити за один раз, і користувача також."
+    username_change_period: "Максимальна кількість днів після реєстрації, щоб облікові записи могли змінити своє ім&#39;я користувача (0, щоб заборонити зміну імені користувача)."
     email_editable: "Дозволити користувачам змінювати свою електронну скриньку після реєстрації."
+    logout_redirect: "URL для переадресації браузера після виходу (наприклад: https://example.com/logout)"
+    allow_uploaded_avatars: "Дозволити користувачам завантажувати власні зображення профілю."
+    allow_animated_avatars: "Дозволити користувачам використовувати анімовані фотографії з профілю GIF. УВАГА: запустіть avatars:refresh rake task після зміни цього налаштування."
+    allow_animated_thumbnails: "Створювати анімовані ескізи анімованих gif-файлів."
+    default_avatars: "URL-адреси до аватарів, які використовуються за замовчуванням для нових користувачів, поки вони їх не змінять."
+    automatically_download_gravatars: "Завантажувати Gravatars для користувачів після створення облікового запису чи зміни електронної пошти."
+    digest_topics: "Максимальна кількість популярних тем для відображення в підсумковому листі електронної пошти."
+    digest_posts: "Максимальна кількість популярних публікацій для відображення в підсумковому листі електронної пошти."
+    digest_other_topics: "Максимальна кількість тем для показу в розділі &quot;Нове в темах і категоріях, які ви читаєте&quot; у підсумковому листі електронної пошти."
+    digest_min_excerpt_length: "Мінімальний витяг з публікації в підсумковий лист електронної пошти, символів."
+    suppress_digest_email_after_days: "Припиняти надсилати підсумкові електронні листи для користувачів, яких не бачили на сайті більше (n) днів."
+    digest_suppress_categories: "Видаляти ці категорії з підсумкових електронних листів."
+    disable_digest_emails: "Вимкнути підсумкові електронні листи для всіх користувачів."
+    apply_custom_styles_to_digest: "Користувацький шаблон електронної пошти та css, які застосовуються для підсумкових електронних листів."
+    email_accent_bg_color: "Колір акценту, який використовується як фон деяких елементів у HTML-листах HTML. Введіть назву кольору (&#39;red&#39;) або шістнадцяткове значення hex (&#39;# FF0000&#39;)."
+    email_accent_fg_color: "Колір тексту, що відображається на тлі bg в листі електронної пошти HTML. Введіть назву кольору (&#39;white&#39;) або шістнадцяткове значення hex  (&#39;#FFFFFF&#39;)."
+    email_link_color: "Колір посилань у HTML-листах. Введіть назву кольору (&#39;blue&#39;) або шістнадцяткове значення hex (&#39;#0000FF&#39;)."
+    detect_custom_avatars: "Чи потрібно перевіряти, що користувачі завантажували власні зображення профілю."
+    max_daily_gravatar_crawls: "Скільки максимальну кількість разів Discourse буде перевіряти Gravatar на користувацькі аватари за день"
+    public_user_custom_fields: "Список користувацьких полів, які можна отримати за допомогою API."
+    staff_user_custom_fields: "Список користувальницьких полів, які можна отримати для співробітників з API."
     allow_profile_backgrounds: "Дозволити користувачам завантажувати фони профілю."
     enable_mobile_theme: "Мобільні пристрої використовуватимуть тему, дружню для них, з можливістю перемикатися на повний сайт. Відключіть це, якщо хочете використовувати власну, повністю чутливу, таблицю стилів."
+    disable_system_edit_notifications: "Вимикає редагування повідомлень користувачем системи, коли активна 'download_remote_images_to_local'."
+    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'>Тег title</a> сторінки містить назву категорії."
+    share_anonymized_statistics: "Діліться анонімною статистикою використання."
+    max_prints_per_hour_per_user: "Максимальна кількість показів сторінок /print (встановити 0 для відключення)"
+    full_name_required: "Повне ім’я - обов’язкове поле профілю користувача."
+    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: "Примусово застосовувати підсвічування коду до всіх заздалегідь відформатованих блоків коду, навіть якщо чітко не вказали мову."
+    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_truncate: "Обрізати вбудовані повідомлення. "
-    emoji_set: "Які вам подобаються смайлики?"
+    embed_support_markdown: "Підтримка Markdown форматування для вбудованих дописів."
+    embed_whitelist_selector: "Список розділених комами елементів CSS, дозволених до вбудовування."
+    allowed_href_schemes: "Схеми, дозволені у посиланнях, крім http та https."
+    embed_post_limit: "Максимальна кількість дописів для вставки."
+    embed_username_required: "Ім’я користувача для створення теми обов’язкове."
+    notify_about_flags_after: "Якщо є прапори, які не оброблялися впродовж стількох годин, надішліть особисте повідомлення модераторам. Встановіть значення 0 для відключення."
+    show_create_topics_notice: "Якщо на сайті менше 5 загальнодоступних тем, покажіть повідомлення про те, щоб адміністратори створили деякі теми."
+    delete_drafts_older_than_n_days: "Видалити чернетки, старші ніж (n) днів."
+    bootstrap_mode_min_users: "Мінімальна кількість користувачів, необхідних для відключення режиму початкового налаштування (встановлено 0 для відключення)"
+    prevent_anons_from_downloading_files: "Заборонити анонімним користувачам завантажувати вкладення. ПОПЕРЕДЖЕННЯ: це зашкодить завантаженню всіх активів сайту, що не мають зображень, розміщених як додатки."
+    slug_generation_method: "Виберіть спосіб генерації slug (рядок ідентифікатор). &#39;закодований&#39; буде генерувати рядок закодований з %. &quot;none&quot; зовсім вимкне slug."
+    enable_emoji: "Увімкнути іконки emoji"
+    enable_emoji_shortcuts: "Поширений смайлик, наприклад :): p :( буде перетворений на emoji"
+    emoji_set: "Які смайлики подобаються вам?"
+    emoji_autocomplete_min_chars: "Мінімальна кількість символів, необхідних для запуску спливаючого вікна смайликів"
+    enable_inline_emoji_translation: "Вмикає переклад вбудованих emoji (без жодного пробілу та пунктуації перед ним)"
+    approve_post_count: "Кількість публікацій нового або базового користувача, які повинні бути затверджені"
+    approve_unless_trust_level: "Повідомлення для користувачів нижче цього рівня довіри повинні бути затверджені"
+    approve_new_topics_unless_trust_level: "Нові теми для користувачів нижче цього рівня довіри повинні бути затверджені"
+    approve_unless_staged: "Нові теми та публікації для інсценованих користувачів повинні бути затверджені"
+    notify_about_queued_posts_after: "Якщо є повідомлення, які очікували на перегляд більше, ніж ця кількість годин, надішліть повідомлення всім модераторам. Встановіть 0, щоб відключити ці сповіщення."
+    auto_close_messages_post_count: "Максимальна кількість дописів, дозволених у повідомленні до його автоматичного закриття (0 для відключення)"
+    auto_close_topics_post_count: "Максимальна кількість дозволених публікацій у темі до її автоматичного закриття (0 для відключення)"
+    code_formatting_style: "Кнопка коду у композиторі за замовчуванням буде мати цей стиль форматування коду"
+    max_allowed_message_recipients: "Максимум одержувачів, дозволених у повідомленні."
+    watched_words_regular_expressions: "Спостережені слова – це регулярні вирази."
+    old_post_notice_days: "За скільки днів допис ставатиме старим"
+    new_user_notice_tl: "Мінімальний рівень довіри, необхідний для перегляду нових повідомлень про публікації користувачів."
+    returning_user_notice_tl: "Мінімальний рівень довіри, необхідний для перегляду повідомлень про публікації користувачів, які повернулись."
+    returning_users_days: "Скільки днів має пройти, перш ніж користувач вважатиметься поверненим."
+    default_email_digest_frequency: "Як часто користувачі отримують підсумкові електронні листи за замовчуванням."
+    default_include_tl0_in_digests: "Додайте публікації нових користувачів до зведених електронних листів за замовчуванням. Користувачі можуть змінити це у своїх налаштуваннях."
+    default_email_level: "Встановіть рівень сповіщення електронною поштою за замовчуванням, коли хтось цитує / відповідає / згадує, або запрошує користувача."
+    default_email_messages_level: "Встановіть рівень сповіщення електронною поштою за замовчуванням, коли хтось повідомляє користувача."
+    default_email_mailing_list_mode: "Надсилайте електронний лист для кожної нової публікації за замовчуванням."
+    default_email_mailing_list_mode_frequency: "Користувачі, які включають режим списку розсилки, отримуватимуть це електронне повідомлення за замовчуванням."
+    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_notification_level_when_replying: "Глобальний рівень сповіщень за замовчуванням, коли користувач відповідає на тему."
+    default_other_external_links_in_new_tab: "Відкривати зовнішні посилання у новій вкладці за замовчуванням."
+    default_other_enable_quoting: "За замовчуванням включати у відповідь цитату для виділеного тексту."
+    default_other_enable_defer: "Увімкнути функцію відкладення теми за замовчуванням."
+    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_first_post: "Список категорій, у яких перше повідомлення в кожній новій темі буде переглянуто за замовчуванням."
+    default_text_size: "Розмір тексту, який вибрано за замовчуванням"
+    default_title_count_mode: "Режим за замовчуванням для лічильника заголовків сторінки"
+    retain_web_hook_events_period_days: "Кількість днів для збереження записів про події web hook."
+    retry_web_hook_events: "Автоматично повторювати невдалі події web hook протягом 4 разів. Проміжки часу між повторними спробами становлять 1, 5, 25 і 125 хвилин."
+    allow_user_api_keys: "Дозволити генерацію ключів API користувача"
+    allow_user_api_key_scopes: "Список даних, дозволених для API ключів користувача"
+    max_api_keys_per_user: "Максимальна кількість ключів API на користувача"
+    min_trust_level_for_user_api_key: "Рівень довіри, необхідний для генерації ключів API користувача"
+    allowed_user_api_auth_redirects: "Дозволена URL-адреса для переадресації автентифікації для ключів API користувача. Символ підстановки * може використовуватися для узгодження будь-якої його частини (наприклад, www.example.com/*)."
+    allowed_user_api_push_urls: "Дозволені URL-адреси для надсилання на сервер push до API"
+    expire_user_api_keys_days: "Кількість днів до того, як автоматично закінчиться термін дії ключа API користувача (0 ніколи)"
+    tagging_enabled: "Увімкнути теги за темами?"
+    min_trust_to_create_tag: "Мінімальний рівень довіри, необхідний для створення тегу."
+    max_tags_per_topic: "Максимум тегів, які можна застосувати до теми."
+    max_tag_length: "Максимальна кількість символів, які можна використовувати в тезі."
+    max_tag_search_results: "Під час пошуку тегів максимальна кількість результатів для показу."
+    show_filter_by_tag: "Показати випадаюче меню для фільтрації списку тем за тегом."
+    max_tags_in_filter_list: "Максимальна кількість тегів для відображення у випадаючому меню фільтра. Будуть показані найбільш використовувані теги."
+    tags_sort_alphabetically: "Показуйте теги в алфавітному порядку. За замовчуванням - показ у порядку популярності."
+    tags_listed_by_group: "Перерахуйте теги за групою тегів на сторінці <a href='%{base_path}/tags' target='_blank'>Теги</a> ."
+    tag_style: "Візуальний стиль для значків тегів."
+    allow_staff_to_tag_pms: "Дозволити співробітникам позначити тегом будь-яке особисте повідомлення"
+    min_trust_level_to_tag_topics: "Мінімальний рівень довіри, необхідний для тегування тем"
+    suppress_overlapping_tags_in_list: "Якщо теги відповідають точним словам у заголовках тем, не показуйте тег"
+    remove_muted_tags_from_latest: "Не показуйте теми, позначені лише відключеними тегами, в списку останніх тем."
+    force_lowercase_tags: "Всі нові теги повинні бути лише з малих літер."
+    company_name: "Назва компанії"
+    governing_law: "Регулююче право"
+    city_for_disputes: "Місто для суперечок"
+    shared_drafts_category: "Увімкніть функцію Спільні чернетки, призначивши категорію для чернеток теми. Теми в цій категорії будуть витіснені зі списку тем для персоналу."
+    push_notifications_prompt: "Відобразити запит на згоду користувача"
+    push_notifications_icon: "Іконка значка, який з’являється в куті сповіщення. Необхідний розмір - 96 × 96."
+    short_title: "Короткий заголовок буде використовуватися на домашньому екрані користувача, стартовому вікні чи інших місцях, де можливо обмежене місце. Він повинен бути обмежений 12 символами."
+    dashboard_general_tab_activity_metrics: "Виберіть звіти для відображення як активні показники діяльності на загальній вкладці."
     errors:
+      invalid_email: "Невірна адреса електроної пошти."
+      invalid_username: "Немає користувача з таким псевдонімом."
+      invalid_group: "Немає групи з такою назвою."
+      invalid_integer_min_max: "Значення має бути від %{min} до %{max}."
+      invalid_integer_min: "Значення має бути %{min} або більше."
+      invalid_integer_max: "Значення не може перевищувати %{max}."
       invalid_integer: "Значення має бути цілим."
       regex_mismatch: "Значення не відповідає потрібному формату."
+      must_include_latest: "Верхнє меню повинно містити вкладку &quot;останні&quot;."
       invalid_string: "Некоректне значення."
       invalid_string_min_max: "Має бути між %{min} та %{max} символів."
       invalid_string_min: "Має бути не менше %{max} символів."
       invalid_string_max: "Має бути не більше ніж %{max} символів."
+      invalid_reply_by_email_address: "Значення повинно містити &#39;%{reply_key}&#39; і відрізнятися від електронного листа зі сповіщеннями."
+      invalid_alternative_reply_by_email_addresses: "Усі значення повинні містити &#39;%{reply_key}&#39; та відрізнятися від електронного листа із сповіщеннями."
+      reply_by_email_address_is_empty: "Ви повинні дозволити &quot;відповідь електронною поштою&quot;, перш ніж вмикати відповіді електронною поштою."
+      user_locale_not_enabled: "Перш ніж увімкнути цей параметр, потрібно спочатку ввімкнути &quot;дозволити локальну інформацію користувача&quot;"
+      invalid_regex: "Regex недійсний або заборонений."
+      email_editable_enabled: "Перш ніж увімкнути цей параметр, ви повинні відключити &quot;редагування електронної пошти&quot;."
+      enable_sso_disabled: "Перш ніж активувати цей параметр, спочатку потрібно ввімкнути &quot;enable sso&quot;."
+      staged_users_disabled: "Перш ніж активувати цей параметр, потрібно спочатку ввімкнути &quot;поетапних користувачів&quot;."
+      reply_by_email_disabled: "Перш ніж активувати це налаштування, потрібно спочатку увімкнути &quot;відповідь електронною поштою&quot;."
+      sso_url_is_empty: "Ви повинні встановити &#39;sso URL&#39;, перш ніж увімкнути це налаштування."
+      sso_invite_only: "Ви не можете ввімкнути sso та запрошення, лише одночасно."
+      enable_local_logins_disabled: "Перш ніж активувати цей параметр, спочатку потрібно ввімкнути функцію 'enable local logins'."
+      min_username_length_exists: "Ви не можете встановити мінімальну довжину імені користувача менше найкоротшого імені користувача (%{username})."
+      min_username_length_range: "Ви не можете встановити мінімум вище максимального."
+      max_username_length_exists: "Ви не можете встановити максимальну довжину імені користувача нижче найдовшого імені користувача (%{username})."
+      max_username_length_range: "Не можна встановити максимум нижче мінімального."
+      invalid_hex_value: "Значення кольорів мають бути шестизначними шістнадцятковими hex кодами."
+      category_search_priority:
+        very_low_weight_invalid: "Ви не можете встановити, що вага перевищує  'category_search_priority_low_weight'."
+        low_weight_invalid: "Ви не можете встановити, що вага буде більшою або рівна 1 або менша, ніж 'category_search_priority_very_low_weight'."
+        high_weight_invalid: "Ви не можете встановити, що вага буде більше або дорівнюватиме 1 або більше, ніж 'category_search_priority_very_high_weight'."
+        very_high_weight_invalid: "Ви не можете встановити вагу менше ніж  'category_search_priority_high_weight'."
+      unicode_username_whitelist:
+        regex_invalid: "Регулярний вираз недійсний: %{error}"
+        leading_trailing_slash: "Регулярний вираз не повинен починатися і закінчуватися косою рисою."
+      unicode_usernames_avatars: "Внутрішні аватари системи не підтримують імен користувачів Unicode."
+      list_value_count: "Список повинен містити точно %{count} значення."
+    placeholder:
+      sso_provider_secrets:
+        key: "www.example.com"
+        value: "Секрет SSO"
   search:
+    extreme_load_error: "Сайт перебуває під надзвичайним навантаженням, пошук вимкнено, повторіть спробу пізніше"
+    within_post: "# %{post_number} від %{username}"
     types:
-      category: "Categories"
+      category: "Категорії"
       topic: "Результати"
-      user: "Users"
+      user: "Користувачі"
+    results_page: "Результати пошуку для &#39;%{term}&#39;"
+  sso:
+    login_error: "Помилка входу"
+    not_found: "Ваш обліковий запис не вдалося знайти. Зверніться до адміністратора сайту."
+    account_not_approved: "Ваш обліковий запис очікує затвердження. Ви отримаєте сповіщення електронною поштою, коли буде отримане схвалення."
+    unknown_error: "Виникла проблема з вашим обліковим записом. Зверніться до адміністратора сайту."
+    timeout_expired: "Час входу в обліковий запис вийшов. Спробуйте знову увійти."
+    no_email: "Не вказано електронну адресу e-mail. Зверніться до адміністратора сайту."
+    email_error: "Не вдалося зареєструвати обліковий запис з електронною поштою <b>%{email}</b>. Зверніться до адміністратора сайту."
+    missing_secret: "Не вдалося встановити автентифікацію SSO через відсутність секрету. Щоб вирішити цю проблему, зверніться до адміністраторів сайту."
   original_poster: "Перший дописувач"
   most_posts: "Найбільше дописів"
   most_recent_poster: "Автор останнього допису"
   frequent_poster: "Частий дописувач"
+  redirected_to_top_reasons:
+    new_user: "Ласкаво просимо до нашої спільноти! Це найпопулярніші останні теми."
+    not_seen_in_a_month: "З поверненням! Ми вас давно не бачили. Це найпопулярніші теми, відколи ви не відвідували форум."
+  merge_posts:
+    edit_reason:
+      one: "Повідомлення було об’єднано %{username}"
+      few: "%{count} повідомлення були об&#39;єднані %{username}"
+      many: "%{count} повідомлення були об&#39;єднані %{username}"
+      other: "%{count} повідомлення були об’єднані %{username}"
+    errors:
+      different_topics: "Повідомлення, що належать до різних тем, неможливо об’єднати."
+      different_users: "Повідомлення, що належать різним користувачам, неможливо об’єднати."
+  move_posts:
+    new_topic_moderator_post:
+      one: "Допис був розділений на нову тему: %{topic_link}"
+      few: "Дописи %{count} були розділені на нову тему: %{topic_link}"
+      many: "Дописи %{count} були розділені на нову тему: %{topic_link}"
+      other: "Дописи %{count} були розділені в нову тему: %{topic_link}"
+    new_message_moderator_post:
+      one: "Повідомлення було розділено на нове повідомлення: %{topic_link}"
+      few: "%{count} повідомлення було поділено на нове повідомлення: %{topic_link}"
+      many: "%{count} повідомлення було поділено на нове повідомлення: %{topic_link}"
+      other: "%{count} допис було поділено на нове повідомлення: %{topic_link}"
+    existing_topic_moderator_post:
+      one: "Повідомлення було об’єднано в існуючу тему: %{topic_link}"
+      few: "Публікації %{count} були об’єднані в існуючу тему: %{topic_link}"
+      many: "Публікації %{count} були об’єднані в існуючу тему: %{topic_link}"
+      other: "Дописи %{count} були об’єднані в існуючу тему: %{topic_link}"
+    existing_message_moderator_post:
+      one: "Повідомлення було об’єднано в існуюче повідомлення: %{topic_link}"
+      few: "Повідомлення %{count} були об&#39;єднані в існуюче повідомлення: %{topic_link}"
+      many: "Повідомлення %{count} були об&#39;єднані в існуюче повідомлення: %{topic_link}"
+      other: "Дописи %{count} були об’єднані в існуюче повідомлення: %{topic_link}"
+  change_owner:
+    post_revision_text: "Право власності передано"
   topic_statuses:
+    autoclosed_message_max_posts:
+      one: "Це повідомлення було автоматично закрито після досягнення максимальної межі відповіді %{count}."
+      few: "Це повідомлення було автоматично закрито після досягнення максимальної межі відповідей %{count}."
+      many: "Це повідомлення було автоматично закрито після досягнення максимальної межі відповідей %{count}."
+      other: "Це повідомлення було автоматично закрито після досягнення максимальної межі відповідей %{count}."
+    autoclosed_topic_max_posts:
+      one: "Цю тему автоматично закрили після досягнення максимальної межі відповіді %{count}."
+      few: "Цю тему автоматично закрили після досягнення максимальної межі відповідей %{count}."
+      many: "Цю тему автоматично закрили після досягнення максимальної межі відповідей %{count}."
+      other: "Цю тему автоматично закрили після досягнення максимальної межі відповідей %{count}."
+    autoclosed_enabled_days:
+      one: "Цю тему автоматично закрили через %{count} день. Нові відповіді більше не дозволені."
+      few: "Ця тема була автоматично закрита через %{count} днів. Нові відповіді більше не дозволені."
+      many: "Ця тема була автоматично закрита через %{count} днів. Нові відповіді більше не дозволені."
+      other: "Ця тема була автоматично закрита через %{count} днів. Нові відповіді більше не дозволені."
+    autoclosed_enabled_hours:
+      one: "Ця тема була автоматично закрита через годину %{count}. Нові відповіді більше не дозволені."
+      few: "Цю тему автоматично закрили через %{count} годин. Нові відповіді більше не дозволені."
+      many: "Цю тему автоматично закрили через %{count} годин. Нові відповіді більше не дозволені."
+      other: "Цю тему автоматично закрили через %{count} годин. Нові відповіді більше не дозволені."
+    autoclosed_enabled_minutes:
+      one: "Цю тему автоматично закрили через %{count} хвилини. Нові відповіді більше не дозволені."
+      few: "Цю тему автоматично закрили через %{count} хвилин. Нові відповіді більше не дозволені."
+      many: "Цю тему автоматично закрили через %{count} хвилин. Нові відповіді більше не дозволені."
+      other: "Цю тему автоматично закрили через %{count} хвилин. Нові відповіді більше не дозволені."
+    autoclosed_enabled_lastpost_days:
+      one: "Цю тему було автоматично закрито через %{count} днів після останньої відповіді. Нові відповіді більше не дозволені."
+      few: "Цю тему автоматично закрили через %{count} днів після останньої відповіді. Нові відповіді більше не дозволені."
+      many: "Цю тему автоматично закрили через%{count} днів після останньої відповіді. Нові відповіді більше не дозволені."
+      other: "Ця тема була автоматично закрита через %{count} днів. Нові відповіді більше не дозволені."
+    autoclosed_disabled_days:
+      one: "Цю тему було автоматично відкрито через %{count} день."
+      few: "Ця тема була автоматично відкрита через %{count} днів."
+      many: "Ця тема була автоматично відкрита через %{count} днів."
+      other: "Ця тема була автоматично відкрита через %{count} днів."
+    autoclosed_disabled_hours:
+      one: "Ця тема була автоматично відкрита через годину %{count}."
+      few: "Цю тему було відкрито автоматично через %{count} годин."
+      many: "Цю тему було відкрито автоматично через %{count} годин."
+      other: "Цю тему було відкрито автоматично через %{count} годин."
+    autoclosed_disabled_minutes:
+      one: "Ця тема була автоматично відкрита через %{count} хвилини."
+      few: "Ця тема була автоматично відкрита через %{count} хвилин."
+      many: "Ця тема була автоматично відкрита через %{count} хвилин."
+      other: "Ця тема була автоматично відкрита через %{count} хвилин."
     autoclosed_disabled: "Тепер ця тема відкрита. Дозволено нові відповіді."
     autoclosed_disabled_lastpost: "Цю тему відкрито. Нові відповіді дозволено."
+    auto_deleted_by_timer: "Автоматично видаляється за таймером."
   login:
+    security_key_description: "Підготувавши свій фізичний ключ безпеки, натисніть кнопку &quot;Аутентифікація за допомогою ключа безпеки&quot; нижче."
+    security_key_alternative: "Не можете знайти ключ безпеки, або хочете скористатися іншим методом?"
+    security_key_authenticate: "Аутентифікувати за допомогою ключа безпеки"
+    security_key_not_allowed_error: "Процес аутентифікації з ключем безпеки або вичерпано, або скасовано."
+    security_key_no_matching_credential_error: "У наданому ключі безпеки не знайдено відповідних облікових даних."
+    security_key_support_missing_error: "Ваш поточний пристрій чи браузер не підтримує використання ключів безпеки. Будь ласка, використовуйте інший метод."
+    security_key_invalid: "Під час перевірки ключа безпеки сталася помилка."
     not_approved: "Ваш обліковий запис ще не було схвалено. Ви отримаєте сповіщення на електронну скриньку, коли зможете увійти."
     incorrect_username_email_or_password: "Неправильне ім'я користувача, електронна скринька або пароль"
+    incorrect_password: "Невірний пароль"
     wait_approval: "Дякуємо за реєстрацію. Ми сповістимо Вас, коли Ваш обліковий запис буде схвалено."
     active: "Тепер Ваш обліковий запис активовано і він готовий до використання."
+    activate_email: "<p>Майже готово! Ми надіслали лист для активації акаунта на адресу <b>%{email}</b>. Будь ласка, виконайте інструкції у цьому листі для активації вашого акаунту.</p><p>Якщо лист не надійшов, перевірте вашу папку спам.</p>"
     not_activated: "Ви ще не можете увійти. Ми надіслали Вам активаційного листа. Будь ласка, дотримуйтеся інструкцій у листі, щоб активувати свій обліковий запис."
+    not_allowed_from_ip_address: "Ви не можете увійти як %{username} з цієї IP-адреси."
+    admin_not_allowed_from_ip_address: "Ви не можете увійти як адміністратор з цієї IP-адреси."
     suspended: "Ви не можете входити до %{date}."
+    suspended_with_reason: "Обліковий запис призупинено до %{date}: %{reason}"
     errors: "%{errors}"
     not_available: "Not available. Try %{suggestion}?"
     something_already_taken: "Щось пішло не так, можливо, ім'я користувача або електронна скринька вже зареєстровані. Спробуйте посилання \"Я забув пароль\"."
+    omniauth_error:
+      generic: "На жаль, під час авторизації вашого акаунта сталася помилка. Будь ласка спробуйте ще раз."
+      csrf_detected: "Час авторизації закінчено, або ви переключили браузери. Будь ласка спробуйте ще раз."
+      request_error: "Під час запуску авторизації сталася помилка. Будь ласка спробуйте ще раз."
+      invalid_iat: "Неможливо перевірити маркер авторизації через відмінності в часі сервера. Будь ласка спробуйте ще раз."
     omniauth_error_unknown: "Something went wrong processing your log in, please try again."
+    omniauth_confirm_title: "Увійдіть, використовуючи %{provider}"
     omniauth_confirm_button: "Продовжити"
+    authenticator_error_no_valid_email: "Не допускаються жодні адреси електронної пошти, пов&#39;язані з %{account}. Можливо, вам доведеться налаштувати свій обліковий запис за допомогою іншої адреси електронної пошти."
+    new_registrations_disabled: "Наразі реєстрація нових облікових записів заборонена."
+    password_too_long: "Паролі обмежені 200 символами."
+    email_too_long: "Ви вказали електронну пошту Email занадто довгу. Адреса поштової скриньки повинна містити не більше 254 символів, а доменні імена не більше 253 символів."
+    reserved_username: "Це ім’я користувача заборонено."
+    missing_user_field: "Ви не заповнили всі поля користувача"
+    auth_complete: "Автентифікація завершена."
+    click_to_continue: "Натисніть тут, щоб продовжити."
+    already_logged_in: "На жаль, ви намагаєтесь прийняти запрошення для іншого користувача. Якщо ви не %{current_user}, вийдіть із системи та повторіть спробу."
     second_factor_title: "Двофакторна автентифікація"
+    second_factor_description: "Введіть необхідний код автентифікації у своєму додатку:"
+    second_factor_backup_description: "Введіть один із резервних кодів:"
+    second_factor_backup_title: "Двофакторний резервний код"
+    invalid_second_factor_code: "Недійсний код аутентифікації Кожен код може бути використаний лише один раз."
+    invalid_security_key: "Недійсний ключ безпеки."
+    second_factor_toggle:
+      totp: "Використовуйте замість програми автентифікатора"
+      backup_code: "Використовуйте замість цього резервний код"
   admin:
     email:
       sent_test: "надіслано!"
   user:
+    deactivated: "Відключено через багато електронних листів, відхилених на '%{email}'."
+    deactivated_by_staff: "Деактивовано персоналом"
+    activated_by_staff: "Активований персоналом"
+    new_user_typed_too_fast: "Новий користувач набирає текст занадто швидко"
+    content_matches_auto_block_regex: "Вміст відповідає автоматичному блоку regex (регулярний вираз)"
     username:
       short: "має бути найменше %{min} символів"
+      long: "має містити не більше %{max} символів"
+      too_long: "занадто довге"
+      characters: "повинні містити лише цифри, літери, тире, крапки та підкреслення"
       unique: "має бути унікальним"
       blank: "має бути наявним"
+      must_begin_with_alphanumeric_or_underscore: "Починати потрібно з літери, цифри або підкреслення"
+      must_end_with_alphanumeric: "має закінчуватись на букву або цифру"
+      must_not_contain_two_special_chars_in_seq: "не повинна містити послідовності з 2 або більше спеціальних символів (.-_)"
+      must_not_end_with_confusing_suffix: "не повинен закінчуватися заплутаним суфіксом, наприклад .json або .png тощо"
     email:
       not_allowed: "is not allowed from that email provider. Please use another email address."
       blocked: "не допускається."
+      revoked: "Не надсилатимуть електронні листи на '%{email}' до %{date}."
+    ip_address:
+      blocked: "Нові реєстрації заборонені з вашої IP-адреси."
+      max_new_accounts_per_registration_ip: "Не дозволяються нові реєстрації з вашої IP-адреси (досягнуто максимального обмеження). Зверніться до співробітника."
+    website:
+      domain_not_allowed: "Веб-сайт недійсний. Дозволені домени: %{domains}"
+    auto_rejected: "Відхилено автоматично через вік. Див. налаштування сайту  auto_handle_queued_age site налаштування."
+    destroy_reasons:
+      unused_staged_user: "Невикористаний інсценований користувач"
+      fixed_primary_email: "Фіксована основна електронна пошта для інсценованого користувача"
+      same_ip_address: "Ідентична IP-адреса (%{ip_address}), як в інших користувачів"
+      inactive_user: "Неактивний користувач"
+  reviewables_reminder:
+    subject_template:
+      one: "%{count} елемент потрібно переглянути"
+      few: "%{count} необхідно переглянути"
+      many: "%{count} необхідно переглянути"
+      other: "%{count}записів необхідно переглянути"
+  unsubscribe_mailer:
+    subject_template: "Підтвердіть, що більше не хочете отримувати оновлення електронною поштою від %{site_title}"
+  invite_mailer:
+    subject_template: "%{inviter_name} запросив вас приєднаися до '%{topic_title}' на %{site_domain_name}"
+  custom_invite_mailer:
+    subject_template: "%{inviter_name} запросив вас приєднаися до '%{topic_title}' на %{site_domain_name}"
+  invite_forum_mailer:
+    subject_template: "%{inviter_name} запрошує вас приднатися до %{site_domain_name}"
+  custom_invite_forum_mailer:
+    title: "Спеціальне запрошення на форум"
+    subject_template: "%{inviter_name} запрошує вас приднатися до %{site_domain_name}"
+  invite_password_instructions:
+    title: "Запит інструкції щодо пароля"
+    subject_template: "Встановіть пароль для вашого акаунта на сайті %{site_name}"
+  download_backup_mailer:
+    title: "Download Backup Mailer"
+    subject_template: "[%{email_prefix}] Завантажити резервну копію сайту"
+    no_token: |
+      На жаль, це резервне посилання для завантаження вже використано або минуло.
+  admin_confirmation_mailer:
+    title: "Підтвердження адміністратора"
+    subject_template: "[%{email_prefix}] Підтвердіть новий обліковий запис Адміністратора "
+  test_mailer:
+    title: "Тест Mailer"
+    subject_template: "[%{email_prefix}] Тест надійності електронної пошти"
+  new_version_mailer:
+    title: "Нова версія Mailer"
+    subject_template: "[%{email_prefix}] Нова версія Discourse, доступно оновлення"
+  new_version_mailer_with_notes:
+    subject_template: "[%{email_prefix}] доступно обновление"
+  flag_reasons:
+    off_topic: "Ваш допис було відмічено спам-прапорцем **Цей допис не по темі**: учасники спільноти вважають, що допис не дуже добре підходить до цієї дискусії (відповідно до її назви та першого повідомлення)."
+    inappropriate: "Ваш допис було відмічено спам-прапорцем **Це недопустимо**: учасники спільноти вважають, що допис образливий, неприпустимий або такий, що порушує [принципи нашої спільноти](https://forum.osvita.ua/guidelines)."
+    spam: "Ваш допис було відмічено спам-прапорцем **Це спам**: учасники спільноти вважають, що це реклама або щось, що має надмірно рекламний характер і не відповідає темі дискусії, як можна було цього очікувати."
+    notify_moderators: "Ваше повідомлення було позначено спам-прапорцем **До уваги модератора**: учасники спільноти вважають, що цей допис потребує модерації. Будь ласка подивіться наші принципи спільноти, можливо ви не дотримались їх."
+  flags_dispositions:
+    agreed: "Дякуємо, що повідомили нас. Ми погоджуємось, що існує проблема, і ми розглядаємо її."
+    agreed_and_deleted: "Дякуємо, що повідомили нас. Ми погоджуємось, що була проблема, і ми видалили пост."
+    disagreed: "Дякуємо, що повідомили нас. Ми погоджуємось, що існує проблема, і ми розглядаємо її."
+    ignored: "Дякуємо, що повідомили нас. Ми погоджуємось, що існує проблема, і ми розглядаємо її."
+    ignored_and_deleted: "Дякуємо, що повідомили нас. Ми видалили публікацію."
   system_messages:
+    private_topic_title: "Тема #%{id}"
+    contents_hidden: "Будь ласка, відвідайте публікацію, щоб побачити її зміст."
+    post_hidden:
+      title: "Допис прихованого"
+      subject_template: "Пост приховано через скарги спільноти"
+    post_hidden_again:
+      title: "Допис знову приховано"
+      subject_template: "Повідомлення приховано через скарги спільноти, персонал повідомлено"
     welcome_user:
       subject_template: "Ласкаво просимо до сайта %{site_name}!"
+    welcome_moderator:
+      title: "Ласкаво просимо модератор"
+      subject_template: "Вітаємо, ви зараз модератор!"
     welcome_invite:
+      title: "Ласкаво просимо"
       subject_template: "Ласкаво просимо до сайта %{site_name}!"
+    backup_succeeded:
+      title: "Резервне копіювання вдалося"
+      subject_template: "Резервне копіювання успішно завершено"
+    backup_failed:
+      title: "Помилка резервного копіювання"
+      subject_template: "Резервне копіювання не вдалося"
+      text_body_template: "Резервне копіювання не вдалося. \n\nОсь журнал: \n\n``` text\n%{logs}\n```\n"
+    restore_succeeded:
+      title: "Відновлення успішне"
+      subject_template: "Відновлення даних успішно завершено"
+    restore_failed:
+      title: "Помилка відновлення"
+      subject_template: "Відновлення даних не вдалося"
+      text_body_template: "Не вдалося відновити. Ось журнал: \n```text\n%{logs}\n```\n"
     bulk_invite_succeeded:
+      title: "Запрошення вдалося успішно"
       subject_template: "Масове запрошення користувачів оброблено успішно"
+      text_body_template: "Ваш файл для масового запршення користувачів було успішно оброблено, віправлено запрошень - %{sent}."
     bulk_invite_failed:
+      title: "Помилка масового запрошення"
       subject_template: "Масове запрошення користувачів оброблено з помилками"
+    csv_export_succeeded:
+      title: "Експорт CSV успішний"
+      subject_template: "[%{export_title}] Експорт даних завершено"
+    csv_export_failed:
+      title: "Не вдалося експортувати CSV"
+      subject_template: "Експорт даних не здійснено"
+    email_reject_auto_generated:
+      title: "Відхилено автоматично створену електронну пошту"
+    email_reject_unrecognized_error:
+      title: "Відхилено нерозпізнану помилку електронною поштою"
+      subject_template: "[%{email_prefix}] Проблема з відправкою пошти -- невідома помилка"
+    email_reject_attachment:
+      title: "Відхилення вкладення електронної пошти"
+      subject_template: "[%{email_prefix}] Проблема електронної пошти - вкладення відхилено"
+    email_reject_reply_not_allowed:
+      title: "Відповіді електронною поштою не дозволено"
+      subject_template: "[%{email_prefix}] Проблема електронної пошти - відповідь не дозволена"
+    email_error_notification:
+      title: "Повідомлення про помилки електронною поштою"
+    email_revoked:
+      title: "Email відкликано"
+      subject_template: "Ваша електронна адреса правильна?"
+    email_bounced: |
+      Повідомлення до %{email} повернулось.
+
+      ### Details
+
+      ``` text
+      %{raw}
+      ```
+    ignored_users_summary:
+      title: "Ігнорований користувач перейшов поріг"
+      subject_template: "Користувач ігнорується багатьма іншими користувачами"
+    too_many_spam_flags:
+      title: "Занадто багато спам-прапорів"
+      subject_template: "Акаунт тимчасово заблоковано"
+    too_many_tl3_flags:
+      title: "Занадто багато прапорів TL3"
+      subject_template: "Акаунт тимчасово заблоковано"
+    silenced_by_staff:
+      title: "Приглушено персоналом"
+      subject_template: "Акаунт тимчасово заблоковано"
+    user_automatically_silenced:
+      title: "Користувач автоматично замовчується"
+      subject_template: "Новий користувач %{username} приглушено прапорами спільноти"
+    spam_post_blocked:
+      title: "Заблоковано за спам-повідомлення"
+      subject_template: "Повідомлення користувача %{username} заблоковані через повторні посилання"
+    unsilenced:
+      title: "Неприглушений"
+      subject_template: "Акаунт більше не заблоковано"
+      text_body_template: "Вітаю! \n\nЦе автоматичне повідомлення від %{site_name}, щоб повідомити, що ваш обліковий запис після перегляду персоналу більше не заблокований. \n\nТепер ви можете створювати нові відповіді та теми знову. Дякуємо за ваше терпіння.\n"
+    pending_users_reminder:
+      title: "Нагадування користувачів у очікуванні"
+      subject_template:
+        one: "%{count} користувач чекає затвердження"
+        few: "%{count} користувачів, які чекають затвердження"
+        many: "%{count} користувачів, які чекають затвердження"
+        other: "%{count} користувачів чекають затвердження"
+      text_body_template: |
+        Є нові реєстрації користувачів, які чекають затвердження (або відхилення), перш ніж вони зможуть отримати доступ до форуму. [Перегляньте їх] (%{base_url}/review).
     download_remote_images_disabled:
+      title: "Завантаження віддалених зображень відключено"
       subject_template: "Завантаження віддалених зображені відключено"
+      text_body_template: "Налаштування `download_remote_images_to_local` было відключено, оскільки диск заповнено до відмітки, що вказана в налаштуванні `download_remote_images_threshold`."
+    dashboard_problems:
+      title: "Проблеми на інформаційній панелі"
+      subject_template: "Нова порада на інформаційній панелі вашого сайту"
+    new_user_of_the_month:
+      title: "Ви новий користувач місяця!"
+      subject_template: "Ви новий користувач місяця!"
+    queued_posts_reminder:
+      title: "Нагадування про черги з повідомленнями"
+      subject_template:
+        one: "%{count} повідомлення, яке чекає перегляду"
+        few: "%{count} публікації, які очікують на розгляд"
+        many: "%{count} публікації, які очікують на розгляд"
+        other: "%{count} дописів, які очікують на розгляд"
+      text_body_template: "Вітаю, \n\nПовідомлення нових користувачів трималися для модерації і наразі чекають їх перегляду. [Схвалити або відхилити їх тут](%{base_url}/review?type=ReviewableQueuedPost).\n"
+  unsubscribe_link: |
+    Щоб скасувати підписку на ці електронні листи, [натисніть тут] (%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Щоб скасувати підписку на ці електронні листи, [натисніть тут] (%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Ви отримуєте це, тому що ви ввімкнули режим списку розсилки. Щоб скасувати підписку на ці електронні листи, [натисніть тут] (%{unsubscribe_url}).
+  subject_re: "Re: "
+  subject_pm: "[PM] "
+  email_from: "%{user_name} на %{site_name}"
   user_notifications:
     previous_discussion: "Попередні відповіді"
+    reached_limit:
+      one: "У голові: ми надсилаємо щодня максимум %{count} електронною поштою. Перегляньте сайт, щоб побачити ті, які можуть бути стримані."
+      few: "Вгору: Ми надсилаємо щодня максимум %{count} електронних листів. Перегляньте сайт, щоб побачити ті, які можуть бути стримані. PS дякую за популярність!"
+      many: "Вгору: Ми надсилаємо щодня максимум %{count} електронних листів. Перегляньте сайт, щоб побачити ті, які можуть бути стримані. PS дякую за популярність!"
+      other: "Вгору: Ми надсилаємо щодня максимум %{count} електронних листів. Перегляньте сайт, щоб побачити те, що могло бути пропущено. PS дякую за популярність!"
+    in_reply_to: "У відповідь на"
     unsubscribe:
       title: "Відпісатися"
       description: "Не зацікавлені в отриманні цих листів? Немає проблем! Натисніть нижче, щоб відписатися назавжди:"
+    reply_by_email: "[Відвідайте тему] (%{base_url}%{url}) або надішліть відповідь на цей електронний лист, щоб відповісти."
+    reply_by_email_pm: "[Відвідайте повідомлення] (%{base_url}%{url}) або дайте відповідь на це повідомлення електронною поштою, щоб відповісти на %{participants}."
+    only_reply_by_email: "Надіслати відповідь на це повідомлення електронною поштою."
+    only_reply_by_email_pm: "Дайте відповідь на цей лист, щоб відповісти на %{participants}."
+    visit_link_to_respond: "[Відвідайте тему](%{base_url}%{url}) для відповіді."
+    visit_link_to_respond_pm: "[Відвідайте повідомлення] (%{base_url}%{url}), щоб відповісти на %{participants}."
     posted_by: "Опубліковано %{username} %{post_date}"
+    pm_participants: "Учасники: %{participants}"
+    user_invited_to_private_message_pm_group:
+      title: "Користувач запрошено групою до PM"
+      subject_template: "[%{email_prefix}] %{username} запросив @%{group_name} до теми '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "Користувача, запрошено до PM"
+      subject_template: "[%{email_prefix}] %{username} запросив вас до теми '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      title: "Користувача, запрошено до PM Staged"
+      subject_template: "[%{email_prefix}] %{username} запросив вас до теми '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "Користувача запрошено до теми"
+      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}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      title: "Користувач відповів PM"
+      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}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      title: "Користувач пов’язаний"
+      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}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned_pm:
+      title: "Згаданий користувач PM"
+      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}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      title: "Користувач створив допис"
+      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}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      title: " Користувач написав PM"
+      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: |2
+
+        %{message}
+    account_suspended:
+      title: "Акаунт призупинено"
+      subject_template: "[%{email_prefix}] Ваш обліковий запис призупинено"
+      text_body_template: "Вас призупинили на форумі до %{suspended_till}. \n\n%{reason} \n\n%{message}\n"
+    account_silenced:
+      title: "Обліковий запис вимкнено"
+      subject_template: "[%{email_prefix}] Ваш обліковий запис вимкнено"
+      text_body_template: "Ви були відключені від форуму до%{silenced_till}. \n\n%{reason} \n\n%{message}\n"
+    account_exists:
+      title: "Обліковий запис вже існує"
+      subject_template: "[%{email_prefix}] Обліковий запис вже існує"
+    account_second_factor_disabled:
+      title: "Двофакторна автентифікація вимкнена"
+      subject_template: "[%{email_prefix}] Двофакторну автентифікацію вимкнено"
     digest:
+      why: "Короткий підсумок %{site_link} з часу останнього вашого візиту на %{last_seen_at}"
+      since_last_visit: "З вашого останнього відвідування"
       new_topics: "Нові теми"
+      unread_messages: "Непрочитані повідомлення"
+      unread_notifications: "Непрочитані сповіщення"
       liked_received: "Отримані вподобання"
       new_users: "Нові користувачі"
+      popular_topics: "Популярні теми"
+      follow_topic: "Слідкування за цією темою"
       join_the_discussion: "Читати більше"
+      popular_posts: "Популярні дописи"
+      more_new: "Нове для вас"
+      subject_template: "[%{email_prefix}] Підсумок"
+      unsubscribe: "Цей підсумок надсилається з %{site_link}, коли ми вас не бачили певний час. Змініть %{email_preferences_link} або %{unsubscribe_link}, щоб скасувати підписку."
+      your_email_settings: "налаштування електронної пошти"
       click_here: "натисніть тут"
+      from: "%{site_name} підсумок "
+      preheader: "Короткий підсумок з часу останнього візиту на %{last_seen_at}"
     forgot_password:
       title: "Забув(ла) пароль"
+      subject_template: "[%{email_prefix}] Зміна пароля"
+    email_login:
+      title: "Увійдіть за посиланням"
+      subject_template: "[%{email_prefix}] Увійти за посиланням"
     set_password:
       title: "Встановити пароль"
+      subject_template: "[%{email_prefix}] Встановити пароль"
+    admin_login:
+      title: "Логін Адміністратора"
+      subject_template: "[%{email_prefix}] Вхід"
+    account_created:
+      title: "Обліковий запис створено"
+      subject_template: "[%{email_prefix}] Ваш новий акаунт"
+    confirm_new_email:
+      title: "Підтвердіть нову електронну пошту"
+      subject_template: "[%{email_prefix}] Підтвердіть свою нову електронну пошту"
+      text_body_template: |
+        Підтвердіть свою нову електронну адресу для %{site_name} натиснувши наступне посилання:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "Підтвердіть стару електронну пошту"
+      subject_template: "[%{email_prefix}] Підтвердіть свою поточну адресу електроної пошти"
+    notify_old_email:
+      title: "Повідомлення на стару електронну пошту"
+      subject_template: "[%{email_prefix}] Вашу електронну адресу змінено"
     signup_after_approval:
+      title: "Реєстрація після затвердження"
       subject_template: "Вас було схвалено на сайті %{site_name}!"
+    signup:
+      title: "Реєстрація"
+      subject_template: "[%{email_prefix}] Підтвердіть свій новий акаунт"
+    activation_reminder:
+      title: "Нагадування про активацію"
+      subject_template: "[%{email_prefix}] Нагадування про підтвердження свого акаунта"
+    suspicious_login:
+      title: "Нове попередження про вхід"
+      subject_template: "[%{site_name}] Новий вхід на сайт"
   page_not_found:
+    title: "Упс! Сторінки не існує або вона приватна."
     popular_topics: "Популярні"
     recent_topics: "Останні"
     see_more: "Більше"
     search_title: "Пошук на цьому сайті"
     search_button: "Пошук"
-  deleted: "deleted"
+  offline:
+    title: "Неможливо завантажити додаток"
+    offline_page_message: "Схоже, ви в офлайні! Перевірте підключення до мережі та повторіть спробу."
+  login_required:
+    welcome_message: |
+      ## [Ласкаво просимо до %{title}] (#welcome)
+      Потрібно зареєструватися. Створіть обліковий запис або увійдіть, щоб продовжити.
+    welcome_message_invite_only: "## [Ласкаво просимо до %{title}](#welcome) \nПотрібен обліковий запис. Будь ласка, попросіть існуючого члена запросити вас, або увійдіть, щоб продовжити.\n"
+  deleted: "видалено"
   image: "зображення"
   upload:
     edit_reason: "завантажені локальні копії забражень"
     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}."
+    file_missing: "Вибачте, ви повинні надати файл для завантаження."
+    empty: "Вибачте, але наданий вами файл порожній."
+    png_to_jpg_conversion_failure_message: "Під час переходу з PNG в JPG сталася помилка."
+    attachments:
+      too_large: "На жаль, файл, який ви намагаєтеся завантажити, занадто великий (максимальний розмір – %{max_size_kb}Kb)."
     images:
+      too_large: "На жаль, зображення, яке ви намагаєтеся завантажити, занадто велике (максимальний розмір – %{max_size_kb}Kb), змініть його розмір і повторіть спробу."
+      larger_than_x_megapixels: "На жаль, зображення, яке ви намагаєтеся завантажити, занадто велике (максимальний розмір – %{max_image_megapixels}-megapixels), змініть його розмір і повторіть спробу."
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
+    placeholders:
+      too_large: "(зображення більше %{max_size_kb}KB)"
+  avatar:
+    missing: "На жаль, ми не можемо знайти жодного аватара, пов’язаного з цією електронною адресою. Чи можете ви спробувати завантажити ще раз?"
+  flag_reason:
+    sockpuppet: "Новий користувач створив тему, а інший новий користувач за тією ж IP-адресою (%{ip_address}) відповів. Дивіться <a href='%{base_path}/admin/site_settings/category/spam'>налаштування</a> сайту <a href='%{base_path}/admin/site_settings/category/spam'>&quot;flag_sockpuppets</a> &quot;."
+    spam_hosts: "Цей новий користувач намагався створити кілька публікацій із посиланнями на один і той же домен. Усі публікації цього користувача, які містять посилання, повинні бути переглянуті. Дивіться <a href='%{base_path}/admin/site_settings/category/spam'>налаштування</a> сайту <a href='%{base_path}/admin/site_settings/category/spam'>&quot;newuser_spam_host_threshold</a> &quot;."
   skipped_email_log:
+    exceeded_emails_limit: " Перевищено max_emails_per_day_per_user"
+    exceeded_bounces_limit: "Перевищено bounce_score_threshold"
+    mailing_list_no_echo_mode: "Сповіщення розсилки вимкнено для власних дописів користувача"
     user_email_no_user: "Can't find user with id %{user_id}"
     user_email_post_not_found: "Can't find a post with id %{post_id}"
+    user_email_anonymous_user: "Користувач анонімний"
+    user_email_user_suspended_not_pm: "Користувач призупинений, без повідомлення"
     user_email_seen_recently: "User was seen recently"
     user_email_notification_already_read: "The notification this email is about has already been read"
     user_email_notification_topic_nil: "post.topic is nil"
+    user_email_post_user_deleted: "Користувача допису видалено."
     user_email_post_deleted: "post was deleted by the author"
     user_email_user_suspended: "user was suspended"
     user_email_already_read: "user has already read this post"
+    user_email_access_denied: "Користувач не має права бачити цей допису"
     sender_message_blank: "message is blank"
     sender_message_to_blank: "message.to is blank"
     sender_text_part_body_blank: "text_part.body is blank"
     sender_body_blank: "body is blank"
+    sender_post_deleted: "допис видалено"
+    sender_message_to_invalid: "одержувач має недійсну електронну адресу"
+  color_schemes:
+    base_theme_name: "База"
+    light: "Світла"
+    dark: "Темна"
+    neutral: "Нейтральна"
+    grey_amber: "Сірий бурштин"
+    shades_of_blue: "Відтінки синього"
+    latte: "Latte"
+    summer: "Літо"
+    dark_rose: "Темна троянда"
+    default_theme_name: "Світла"
+    light_theme_name: "Світла"
+    dark_theme_name: "Темна"
+    neutral_theme_name: "Нейтральна"
+    grey_amber_theme_name: "Сірий бурштин"
+    shades_of_blue_theme_name: "Відтінки синього"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Літо"
+    dark_rose_theme_name: "Темна троянда"
   edit_this_page: "Редагувати цю сторінку"
   csv_export:
     boolean_yes: "Так"
     boolean_no: "Ні"
+  static_topic_first_reply: |
+    Відредагуйте перший допис в цій темі, щоб змінити вміст сторінки %{page_name}.
   guidelines_topic:
     title: "ЧаПи/Інструкції"
   tos_topic:
@@ -578,39 +2534,269 @@ uk:
   badges:
     editor:
       name: Редактор
+      description: Відредагував свій перший пост
+    wiki_editor:
+      name: Редактор Wiki
+      description: "Перше редагування wiki "
+      long_description: |
+        Цей знак надається під час першого редагування допису wiki.
+    basic_user:
+      name: Базовий користувач
+      description: "<a href=\"https://forum.osvita.ua/t/topic/57\">Отримано доступ</a> до всіх основних функцій спільноти"
     member:
       name: Учасник
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Отримано доступ</a> запрошення, групові повідомлення та інше"
     regular:
       name: Звичайний
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Отримано доступ</a> змін категорій, перейменування, поширення посилань, wiki та інше"
+    leader:
+      name: Лідер
+      description: "<a href=\"https://forum.osvita.ua/t/topic/57\">Отримано доступ</a> до редагування, закріплення, закриття, об'єднання тем"
     welcome:
       name: Ласкаво просимо
+      description: Ваш пост отримав лайк від іншого користувача
     autobiographer:
       name: Автобіографіст
+      description: "Заповнена інформація <a href=\"%{base_uri}/my/preferences/profile\">профілю</a>"
     anniversary:
       name: Річниця
+      description: Активний користувач протягом року
+    nice_post:
+      name: Добра відповідь
+      description: Отримав 10 лайків за відповідь
+    good_post:
+      name: Добра відповідь
+      description: Отримав 25 лайків за відповідь
+      long_description: |
+        Цей знак надається, коли ваша відповідь налічує 25 лайків. Ваша відповідь була винятковою і зробила розмову набагато цікавішою.
+    great_post:
+      name: Чудова відповідь
+      description: Отримав 50 лайків за відповідь
+      long_description: |
+        Цей знак надається, коли ваша відповідь налічує 50 лайків. Оце Так! Ваша відповідь була натхненною, захоплюючою, веселою чи проникливою, і спільноті сподобалась!
     nice_topic:
       name: Непогана тема
+      description: Отримав 10 симпатій за тему
+      long_description: |
+        Цей знак надається, коли ваша тема отримує 10 лайків. Ви розпочали цікаву розмову, яка сподобалась спільноті.
     good_topic:
       name: Хороша тема
+      description: Отримав 25 симпатій за тему
+      long_description: |
+        Цей знак надається, коли ваша тема отримує 25 лайків. Ви розпочали яскраву розмову, яка згуртувала спільноту.
     great_topic:
       name: Чудова тема
+      description: Отримав 50 симпатій за тему
+      long_description: |
+        Цей знак надається, коли ваша тема отримує 50 лайків. Ви розпочали захоплюючу розмову, і спільнота вподобала жваву дискусію, що виникла!
+    nice_share:
+      name: Добрий піар
+      description: Поділився посиланням за яким прийшли 25 відвідувачів
+      long_description: |
+        Цей знак надається за обмін посиланням, яке натиснули 25 зовнішніх відвідувачів. Дякуємо за поширення посилання на наші дискусії та цю спільноту.
+    good_share:
+      name: Гарний піар
+      description: Поділився посиланням за яким прийшли 300 відвідувачів
+      long_description: |
+        Цей знак надається за обмін посиланням, яке натиснули 300 сторонніх відвідувачів. Гарна робота! Ви продемонстрували велику дискусію перед купою нових людей і допомогли цій спільноті зрости.
+    great_share:
+      name: Відмінний піар
+      description: Поділився посиланням за яким прийшли 1000 відвідувачів
+    first_like:
+      name: Перший Like
+      description: Вподобав пост
+    first_flag:
+      name: Перший прапор
+      description: Позначив допис
+    promoter:
+      name: Промоутер
+      description: Запросив користувача
+    campaigner:
+      name: Активіст
+      description: Запросив 3-х користувачів
+    champion:
+      name: Чемпіон
+      description: Запросив 5 членів
+    first_share:
+      name: Спочатку поділіться
+      description: Поділився публікацією
     first_link:
       name: Перше посилання
+      description: Додано посилання на іншу тему
     first_quote:
       name: Перша цитата
+      description: Цитував пост
     read_guidelines:
       name: Читати інструкції
+      description: Прочитав <a href="/guidelines"> принципи спільноти</a>
     reader:
       name: Читач
+      description: "Прочитайте кожну відповідь у темі, що містить понад 100 відповідей"
+    popular_link:
+      name: Популярне посилання
+      description: "Опублікував посилання, що отримало 50 кліків"
+    hot_link:
+      name: Гаряче посилання
+      description: "Опублікував посилання, що отримало 300 кліків"
+    famous_link:
+      name: Легендарне посилання
+      description: "Опублікував посилання, що отримало 1000 кліків"
+    appreciated:
+      name: Вдячний
+      description: Отримав 1 лайк на 20 дописів
+    respected:
+      name: З повагою
+      description: Отримав 2 лайки на 100 дописів
+    admired:
+      name: Величний
+      description: Отримав 5 лайків у 300 дописах
+    out_of_love:
+      name: Любов
+      description: Використав 50 лайків протягом дня
+    higher_love:
+      name: Вища любов
+      description: Використав 50 лайків протягом дня 5 разів поспіль
+    crazy_in_love:
+      name: Шалене кохання
+      description: Використав 50 лайків протягом дня 20 днів поспіль
+      long_description: |
+        Цей знак надається, коли ви використовуєте всі 50 своїх щоденних лайків протягом 20 днів. Оце Так! Ви є прикладом для наслідування та заохочення членів спільноти!
+    thank_you:
+      name: Дякуємо
+      description: Отримав лайки у 20 дописах та надав 10 лайків іншим
+      long_description: |
+        Цей знак надається, коли у вас є 20 вподобаних публікацій і ви отримуєте 10 і більше лайків натомість. Коли комусь подобаються ваші публікації, ви знаходите час, щоб вподобати і тих, хто публікують інші дописи також.
+    gives_back:
+      name: Взаємна симпатія
+      description: Отримав лайки у 100 дописах та надав 100 лайків іншим
+      long_description: |
+        Цей знак надається, коли у вас є 100 вподобаних публікацій і ви отримуєте 100 або більше лайків у відповідь. Дякуємо, що заплатили наперед!
+    empathetic:
+      name: Чуйний
+      description: Отримав лайки у 500 дописах та надав 1000 лайків іншим
+      long_description: |
+        Цей знак надається, коли у вас є 500 вподобаних публікацій і ви отримуєте 1000 або більше лайків у відповідь. Оце Так! Ви - зразок щедрості та взаємної вдячності :two_hearts:.
+    first_emoji:
+      name: Перший смайл
+      description: Використав смайл у дописі
+      long_description: |
+        Цей знак надається вперше, коли ви додаєте Emoji до свого допису :thumbsup:. Emoji дозволяє передати емоції у своїх публікаціях, від щастя :smiley: до смутку :anguished: до гніву :angry: і все що між ними :sunglasses:. Просто введіть a: (двокрапка) або натисніть кнопку панелі інструментів Emoji в редакторі, щоб вибрати один із сотень варіантів :ok_hand:
+    first_mention:
+      name: Перше згадування
+      description: Згадав ім’я користувача в дописі
+      long_description: |
+        Цей знак надається вперше, коли ви згадуєте чиєсь @username у своєму дописі. Кожна згадка генерує сповіщення цій особі, щоб вони знали про ваш допис. Просто почніть вводити @(як символ), щоб згадати будь-якого користувача або, якщо це дозволено, групу – це зручний спосіб донести щось до їхньої уваги.
+    first_onebox:
+      name: Розумна вставка
+      description: Опублікував посилання у вигляді onebox
+      long_description: |
+        Цей знак надається вперше, коли ви публікуєте посилання в окремому рядку, яке автоматично розгортається в одну скриньку із текстом, заголовком та (коли є) зображенням.
+    first_reply_by_email:
+      name: Відповідь поштою
+      description: Відповів на повідомлення або тему поштою
+      long_description: |
+        Цей знак надається при першій відповіді на повідомлення електронною поштою :e-mail:.
+    new_user_of_the_month:
+      name: "Користувач місяця"
+      description: Значний внесок в першому місяці
+      long_description: |
+        Цей знак надається для того, щоб привітати двох нових користувачів щомісяця за відмінний загальний внесок, який вимірюється тим, наскільки часто їх публікації сподобалися та ким.
+    enthusiast:
+      name: Ентузіаст
+      description: Відвідував сайт 10 днів поспіль
+      long_description: |
+        Цей знак надається за відвідування 10 днів поспіль. Дякуємо, що тримаєтесь у нас більше тижня!
+    aficionado:
+      name: Шанувальник
+      description: Відвідував сайт 100 днів поспіль
+      long_description: |
+        Цей знак надається за відвідування 100 днів поспіль. Це більше трьох місяців!
+    devotee:
+      name: Відданий
+      description: Відвідав 365 днів поспіль
+      long_description: |
+        Цей знак надається за відвідування 365 днів поспіль. Ого, цілий рік!
+    badge_title_metadata: "%{display_name} нагорода на %{site_title}"
+  admin_login:
+    success: "Листа відправлено"
+    errors:
+      unknown_email_address: "Невідома електронна адреса."
+      invalid_token: "Неприпустимий token."
+    email_input: "Електронна пошта Адміністратора"
+    submit_button: "Відправити лист"
+  performance_report:
+    initial_post_raw: Ця тема включає щоденні звіти про ефективність вашого сайту.
+    initial_topic_title: Звіти про ефективність веб-сайту
   tags:
     title: "Теги"
+    staff_tag_disallowed: 'Тег &quot;%{tag}&quot; може застосовувати лише персонал.'
+    staff_tag_remove_disallowed: 'Тег &quot;%{tag}&quot; може видаляти лише персонал.'
+    minimum_required_tags:
+      one: "Ви повинні вибрати принаймні тег %{count}."
+      few: "Ви повинні вибрати принаймні %{count} теги."
+      many: "Ви повинні вибрати принаймні %{count} теги."
+      other: "Ви повинні вибрати принаймні %{count} теги."
+    upload_row_too_long: "У файлі CSV повинен бути один тег на рядок. За бажанням тег може супроводжуватися комою, а потім назвою групи тегів."
+    forbidden:
+      invalid:
+        one: "Обраний вами тег не можна використовувати"
+        few: "Жоден із вибраних вами тегів не може бути використаний"
+        many: "Жоден із вибраних вами тегів не може бути використаний"
+        other: "Жоден із вибраних вами тегів не може бути використаний"
+      in_this_category: '&quot;%{tag_name}&quot; не можна використовувати в цій категорії'
+      restricted_to:
+        one: '&quot;%{tag_name}&quot; обмежений категорією &quot;%{category_names}&quot;'
+        few: '&quot;%{tag_name}&quot; обмежено такими категоріями: %{category_names}'
+        many: '&quot;%{tag_name}&quot; обмежено такими категоріями: %{category_names}'
+        other: '&quot;%{tag_name}&quot; обмежено такими категоріями: %{category_names}'
+  rss_by_tag: "Теми з тегом %{tag}"
   finish_installation:
+    congratulations: "Вітаємо, Ви встановили Дискурс!"
+    register:
+      button: "Зареєструватись"
+      title: "Зареєструйте обліковий запис адміністратора"
+      help: "зареєструйте новий обліковий запис, щоб розпочати роботу"
+    confirm_email:
+      title: "Підтвердіть свою електронну пошту"
     resend_email:
       title: "Надіслати ще раз листа для активації"
+      message: "<p> Ми повторно надіслали електронний лист для активації на <b>%{email}</b>"
+  safe_mode:
+    title: "Увійти в безпечний режим"
+    description: "Безпечний режим дозволяє тестувати сайт без завантаження плагінів або інших налаштувань сайту."
+    no_customizations: "Вимкнути поточну тему"
+    only_official: "Вимкнути неофіційні плагіни"
+    no_plugins: "Вимкнути всі плагіни"
+    enter: "Увійти в безпечний режим"
+    must_select: "Ви повинні вибрати принаймні одну опцію для входу в безпечний режим."
   wizard:
+    title: "Налаштування Discourse"
     step:
+      locale:
+        title: "Ласкаво просимо у Ваш Discourse!"
+        fields:
+          default_locale:
+            description: "Мова за замовчуванням для Вашої спільноти?"
       forum_title:
-        title: "Ім'я"
+        title: "Назва"
+        description: "Ваша назва - це знак видимий здалеку, <i>перша</i> річ яку можливі відвідувачі помітять у вашому співтоваристві. Що ваше ім'я і назва говорять про вашу спільноту?"
+        fields:
+          title:
+            label: "Назва спільноти"
+            placeholder: "Женіна тусовка"
+          site_description:
+            label: "Опишіть Ваше співтовариство одним коротким реченням"
+            placeholder: "Місце для Джейн та її друзів для обговорення класних речей"
+          short_site_description:
+            label: "Опишіть свою спільноту в декількох словах"
+            placeholder: "Краще співтовариство"
+      introduction:
+        title: "Вступ"
+        fields:
+          welcome:
+            label: "Привітальна тема"
+            description: "<p>Як би Ви описали ваше співтовариство незнайомцю в ліфті за 1 хвилину?</p> <ul> <li>Для кого це обговорення?</li> <li>Що я можу знайти там?</li> <li>Чому я повинен зайти?</li> <ul> <p>Ваше привітальне повідомлення - це перше, що нові відвідувачі прочитають. Думайте про це повідомлення як про Вашу \"коротку презентацію в ліфті\" або \"концепції діяльності компанії\", що складається з <b>одного абзаца</b>.</p>"
+            one_paragraph: "Будь ласка, обмежте Ваше вітальне повідомлення одним абзацом."
       privacy:
         title: "Доступ"
         fields:
@@ -618,41 +2804,220 @@ uk:
             choices:
               open:
                 label: "Публічні"
+                description: "Кожен може отримати доступ до цієї спільноти"
               restricted:
                 label: "Приватні"
+                description: "Тільки зареєстровані користувачі можуть отримати доступ до цієї спільноти"
+          privacy_options:
+            description: "Як нові користувачі реєструють обліковий запис?"
+            choices:
+              open:
+                label: "Користувачі можуть зареєструватися самостійно."
+              invite_only:
+                label: "Користувачі можуть зареєструватися самостійно, але це повинно бути схвалено персоналом."
+              must_approve:
+                label: "Користувачів потрібно запросити довіреними користувачами або співробітниками, перш ніж вони можуть зареєструватися."
       contact:
+        title: "Контакти"
         fields:
           contact_email:
+            label: "Електронна пошта"
             placeholder: "електронна скринька"
+            description: "Адреса електронної пошти людини або групи, відповідальних за цю спільноту. Використовується для важливих повідомлень, таких як черга анонімних скарг на обробку, оновлення безпеки движка форуму. Також використовується на <a href='%{base_path}/about' target='_blank'>сторінці інформації про спільноту</a> як контакт для зв'язку."
+          contact_url:
+            label: "Веб-сторінка"
+            placeholder: "https://www.example.com/contact-us"
+            description: "Головна сторінка для зв'язку з Вами або Вашою організацією. Відображатиметься на <a href='%{base_path}/about' target='_blank'>вашій інформаційній сторінці</a>."
+          site_contact:
+            label: "Автоматичне повідомлення"
+            description: "Усі автоматичні дискусійні персональні повідомлення будуть надсилатися від цього користувача, такі як попередження про прапор та повідомлення про завершення резервного копіювання."
       corporate:
         title: "Організація"
+        fields:
+          company_name:
+            label: "Назва Компанії"
+            placeholder: "Приклад Організації"
+          governing_law:
+            label: "Регулюючий Закон"
+            placeholder: "Закон Каліфорнії"
+          city_for_disputes:
+            label: "Місто для суперечок"
+            placeholder: "Сан-Франциско, Каліфорнія"
       colors:
-        title: "Тема"
+        title: "Кольорова схема"
+      themes_further_reading:
+        title: "Стилі"
+      logos:
+        title: "Логотипи"
+        fields:
+          logo:
+            label: "Основний Логотип"
+            description: "Зображення логотипа в лівому верхньому кутку вашого сайту. Використовуйте широке прямокутне зображення з висотою 120 і співвідношенням сторін більше 3:1"
+          logo_small:
+            label: "Квадратний Логотип"
+            description: "Квадратна версія вашого логотипу. Відображається в лівій верхній частині веб-сайту під час прокрутки вниз, у веб-переглядачі та при спільному використанні на соціальних платформах. В ідеалі більше 512x512."
+      icons:
+        title: "Іконки"
+        fields:
+          favicon:
+            label: "Значок браузера"
+            description: "Іконка, що використовується для представлення вашого веб-сайту у веб-браузерах, добре виглядає в невеликих розмірах. Рекомендовані розширення зображення – PNG або JPG. Ми будемо використовувати квадратний логотип за замовчуванням."
+          large_icon:
+            label: "Велика іконка"
+            description: "Іконка використовується для представлення вашого сайту на сучасних пристроях, що добре виглядає на великих розмірах. В ідеалі більший за 512 × 512. Ми будемо використовувати квадратний логотип за замовчуванням."
+      homepage:
+        description: "Ми рекомендуємо показувати останні теми на Вашій домашній сторінці, але Ви також можете показувати розділи (групи тем), якщо матимете таке бажання."
+        title: "Головна сторінка"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "Останні теми"
+              categories_only:
+                label: "Тільки Категорії"
+              categories_with_featured_topics:
+                label: "Категорії і їх Кращі Теми"
+              categories_and_latest_topics:
+                label: "Категорії та список Останніх Тим"
+              categories_and_top_topics:
+                label: "Категорії і Важливі Теми"
+              categories_boxes:
+                label: "Категорії в коробках"
+              categories_boxes_with_topics:
+                label: "Категорії в коробках з Темами"
+      emoji:
+        title: "Смайли"
+        description: "Виберіть стиль смайлів для спільноти. Надалі, ви зможете додати інші стилі смайлів в адмінці, в секції Оформлення/Смайли."
+      invites:
+        title: "Запросити як персонал"
+        description: "Ви майже закінчили! Давайте запросимо людей, які допоможуть вам <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>почати обговорення</a> з цікавих тем і відповідей, щоб ваше співтовариство почало роботу."
+        disabled: "Оскільки локальні облікові записи відключені, відправляти запрошення кому-небудь неможливо. Будь ласка, перейдіть до наступного кроку."
+      finished:
+        title: "Ваш Discourse готовий!"
+        description: |
+          <p>Якщо вам коли-небудь захочеться змінити ці настройки, <b>перезапустіть цей майстер в будь-який час</b>, або зайдіть в <a href='%{base_path}/admin' target='_blank'>розділ адміністрування</a>; його можна знайти по значку гайкового ключа в меню сайту.</p>
+          <p>Бажаємо успіхів в <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>побудові вашої нової спільноти!</a></p>
+  search_logs:
+    graph_title: "Кількість пошуків"
   joined: "Приєднався(лась)"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} згадав вас у "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} згадав вас у "%{topic}" - %{site_title}'
+      quoted: '%{username} процитував вас у "%{topic}" - %{site_title}'
+      replied: '%{username} відповів вам в "%{topic}" - %{site_title}'
+      posted: '%{username} опублікував в "%{topic}" - %{site_title}'
+      private_message: '%{username} надіслав вам приватне повідомлення в "%{topic}" - %{site_title}'
+      linked: '%{username} поставив посилання з "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} створив нову тему "%{topic}" - %{site_title}'
+      confirm_title: "Повідомлення увімкнені - %{site_title}"
+      confirm_body: "Успіх! Повідомлення увімкнені."
+      custom: "Повідомлення від %{username} на %{site_title}"
+  staff_action_logs:
+    not_found: "не знайдено"
+    unknown: "невідомо"
+    user_merged: "%{username} був об'єднаний з цим обліковим записом"
+    user_delete_self: "Вилучено самостійно з %{url}"
+    webhook_deactivation_reason: "Ваш webhook автоматично відключений. Ми отримали декілька відповідей з помилками HTTP-статусу '%{status}'."
   reviewables:
     priorities:
-      medium: "Середній"
+      low: "Низький"
+      medium: "Сиредній"
       high: "Високий"
     sensitivity:
+      disabled: "Відключено"
+      low: "Низький"
       medium: "Середній"
       high: "Високий"
+    must_claim: "Ви повинні спочатку отримати скарги, перш ніж реагувати на них"
+    user_claimed: "Цей елемент був використаний іншим користувачем."
+    missing_version: "Ви повинні надати параметр версії"
+    conflict: "Був конфлікт з оновленням, який заважав вам це робити."
+    reasons:
+      post_count: "Перші кілька повідомлень від кожного користувача повинні бути затверджені персоналом. Див. &quot;approve_post_count&quot;."
+      trust_level: "Відповіді користувачів з низьким рівнем довіри повинні бути затверджені персоналом. Перегляньте розділ `approve_unless_trust_level`."
+      new_topics_unless_trust_level: "Теми користувачів з низьким рівнем довіри повинні бути затверджені персоналом. Див. розділ `approve_new_topics_unless_trust_level`."
+      fast_typer: "Новий користувач набрав своє перше повідомлення підозріло швидко, є підозра про  поведінку бота чи спамера. Див. `min_first_post_typing_time`."
+      auto_silence_regexp: "Зареєстрований учасник, чиє перше повідомлення відповідає `auto_silence_first_post_regex` налаштуванням."
+      watched_word: "Ця публікація включена \"Спостережним словом\". Дивіться ваш <a href='%{base_url}/admin/logs/watched_words'>список спостережень слів</a>."
+      staged: "Нові теми та публікації для проміжних користувачів повинні бути затверджені персоналом. Дивіться `approve_unless_staged`."
+      category: "Дописи в цій категорії вимагають ручного схвалення персоналом. Дивіться налаштування категорії."
+      must_approve_users: "Всіх нових користувачів потрібно схвалити персоналом. Дивіться `must_approve_users`."
+      invite_only: "Всіх нових користувачів потрібно запросити. Дивіться `invite_only`."
     actions:
+      agree:
+        title: "Погодитися…"
+      agree_and_keep:
+        title: "Залишити допис"
+        description: "Погодитися з прапором і залишити допис без змін"
+      agree_and_keep_hidden:
+        title: "Зберігати допис прихованим"
+        description: "Погодитись з прапором і залишити допис прихованим."
       agree_and_suspend:
-        title: "Призупинити користувача"
+        title: "Заморозити користувача"
+        description: "Погодитися з прапором та заморозити користувача."
+      agree_and_silence:
+        title: "Відключений користувач"
+        description: "Погодитися з прапором та відключити користувача."
+      agree_and_restore:
+        title: "Відновити допис"
+        description: "Відновити повідомлення, щоб усі користувачі могли його бачити."
+      agree_and_hide:
+        title: "Сховати допис"
+        description: "Приховати цей пост і автоматично відправити користувачеві повідомлення з проханням відредагувати його."
       delete_spammer:
         title: "Видалити спамера"
+        description: "Видалити користувача та всі його повідомлення і теми."
+        confirm: "Ви впевнені, що хочете видалити всі повідомлення користувача, теми та заблокувати його IP-адресу та E-mail?"
       delete_single:
         title: "Видалити"
+      delete:
+        title: "Видалити допис…"
+      delete_and_ignore:
+        title: "Видалити допис та Ігнорувати"
+        description: "Видалити допис; якщо це перший допис, видалиться також тема"
+      delete_and_ignore_replies:
+        title: "Видалити допис + Відповіді та ігнорувати"
+        description: "Видалити допис і всі відповіді до нього; якщо це перший пост, то видалити також тему"
+        confirm: "Ви впевнені, що хочете видалити відповіді на повідомлення?"
+      delete_and_agree:
+        title: "Видалити допис Погодитися"
+        description: "Видалити допис; якщо це перший допис, то видалиться також тема"
+      delete_and_agree_replies:
+        title: "Видалити допис + Відповіді та Погодитися"
+        description: "Видалити допис і всі відповіді до нього; якщо це перший пост, то видалити також тему"
+        confirm: "Ви впевнені, що хочете видалити відповіді на повідомлення?"
+      disagree_and_restore:
+        title: "Не згоден, відновити допис"
+        description: "Відновити повідомлення, щоб усі користувачі могли його бачити."
       disagree:
-        title: "Відмовитися"
+        title: "Відмовити"
       ignore:
         title: "Ігнорувати"
       approve:
         title: "Схвалити"
+      approve_post:
+        title: "Схвалити допис"
+        confirm_closed: "Ця тема закрита. Чи хочете ви все одно створити допис?"
+      reject_post:
+        title: "Відхилити допис"
+      approve_user:
+        title: "Підтвердити користувача"
       reject_user:
+        title: "Видалити користувача"
         delete:
           title: "Видалити користувача"
+          description: "Користувача буде видалено з форума."
+        block:
+          title: "Видалити та заблокувати користувача"
+          description: "Користувач буде видалений, і ми заблокуємо його IP-адресу і e-mail."
       reject:
         title: "Відхилити"
       delete_user:
         title: "Видалити користувача"
+        confirm: "Ви впевнені, що хочете видалити цього користувача? Це видалить всі їхні повідомлення і заблокує їх E-mail та IP-адресу."
+        reason: "Вилучено через чергу перегляду"
+  email_style:
+    html_missing_placeholder: "Шаблон html повинен містити %{placeholder}"
+  discord:
+    not_in_allowed_guild: "Помилка аутентифікації. Ви не є членом дозволеної гільдії Discord."
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 61e682830d..ac6c782dba 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -91,7 +91,6 @@ ur:
         from_reply_by_address_error: "ہو جاتا ہے جب ہم فرام ہیڈر جواب بذریعہ ای میل ایڈریس سے ملتا ہے۔"
         inactive_user_error: "ہو جاتا ہے جب بھیجنے والا سرگرم نہ ہو۔"
         silenced_user_error: "ہو جاتا ہے جب بھیجنے والا خاموش کیا گیا ہو۔"
-        bad_destination_address: "ہو جاتا ہے جب To/Cc/Bcc فیلڈز میں کوئی بھی ای میل ایڈریس ترتیب کردہ آنے والے ای میل ایڈریسوں سے مَیچ نہ کرے۔"
         strangers_not_allowed_error: "ہو جاتا ہے جب کسی صارف نے ایک ایسے زُمرہ میں نیا ٹاپک بنانے کی کوشش کی ہو جس کا وہ رکن نہ ہوں۔"
         insufficient_trust_level_error: "ہو جاتا ہے جب کسی صارف نے ایک ایسے زُمرہ میں نیا ٹاپک بنانے کی کوشش کی ہو جس پر اُن کے پاس مطلوبہ ٹرسٹ لَیول نہ ہو۔"
         reply_user_not_matching_error: "ہو جاتا ہے جب جواب ایک ایسے ای میل ایڈریس سے آیا ہو جو اطلاع بھیجے جانے والے ایڈریس سے مختلف ہو۔"
@@ -729,7 +728,6 @@ ur:
     activated: "معذرت، یہ اکاؤنٹ پہلے ہی سے چالو کر دیا گیا ہے۔"
     admin_confirm:
       title: "توثیق ایڈمن اکاؤنٹ"
-      description: "کیا آپ واقعی <b>%{target_username}</b> کو ایک ایڈمِنِسٹریٹر بننا چاہتے ہیں؟"
       grant: "عطا ایڈمن رسائی"
       complete: "<b>%{target_username}</b> اب ایک ایڈمِنِسٹریٹر ہے۔"
       back_to: "%{title} پر واپس جائیں"
@@ -1266,7 +1264,6 @@ ur:
     editing_grace_period_max_diff_high_trust: "ترمیم کی رعایتی مدت کے دوران حروف تبدیلیوں کی زیادہ سے زیادہ تعداد، اگر اِس سے زیادہ تبدیل کیے جائیں تو ایک اور پوسٹ رَوِیژن سٹور کریں (ٹرسٹ لَیول 2 اور اوپر)"
     staff_edit_locks_post: "پوسٹس کو ترمیم کرنے سے روک دیا جائے گا اگر وہ اسٹاف کے اراکین کی طرف سے ترمیم کی گئی ہوں"
     post_edit_time_limit: "ایک tl0 یا tl1 مصنف اشاعت کے بعد (ن) منٹ تک اپنی پوسٹ میں ترمیم یا اسے خارج کرسکتا ہے۔ ہمیشہ کیلئے 0 پر سَیٹ کریں۔"
-    tl2_post_edit_time_limit: "ایک tl2 مصنف اشاعت کے بعد (ن) منٹ تک اپنی پوسٹ میں ترمیم یا اسے خارج کرسکتا ہے۔ ہمیشہ کیلئے 0 پر سَیٹ کریں۔"
     edit_history_visible_to_public: "سب کو ایک ترمیم شدہ پوسٹ کے پچھلے ورژن دیکھنے کی اجازت دیں۔ غیر فعال ہونے پر، صرف اسٹاف ممبران دیکھ سکتے ہیں۔"
     delete_removed_posts_after: "مصنف کی طرف سے ہٹائی گئی پوسٹس خود کار طریقے سے (ن) گھنٹوں کے بعد حذف کردی جائیں گی۔ اگر 0 پر سیٹ ہو، تو پوسٹس کو فوری طور پر حذف کردیا جائے گا۔"
     max_image_width: "پوسٹ میں تصاویر کی زیادہ سے زیادہ تھَمب نَیل چوڑائی"
@@ -1435,9 +1432,9 @@ ur:
     enable_github_logins: "گِٹ ہَب توثیق فعال کریں۔ github_client_id اور github_client_secret ضروری ہیں۔ دیکھیے <a href='https://meta.discourse.org/t/13745' target='_blank'>ڈسکورس کیلئے گِٹ ہَب لاگ اِن ترتیب دیں</a>۔"
     github_client_id: "گِٹ ہَب توثیق کیلئے کلائنٹ آئی ڈی، <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a> پر رجسٹر کردہ"
     github_client_secret: "گِٹ ہَب توثیق کیلئے کلائنٹ سیکرٹ، <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a> پر رجسٹر کردہ"
-    enable_discord_logins: 'صارفین کو بذریعہ ڈِسکَورڈ تصدیق کی اجازت دیں؟'
+    enable_discord_logins: "صارفین کو بذریعہ ڈِسکَورڈ تصدیق کی اجازت دیں؟"
     discord_client_id: 'ڈِسکَورڈ کلائنٹ ID (ایک کی ضرورت ہے؟ <a href="https://discordapp.com/developers/applications/me">ڈِسکَورڈ ڈَوَیلپر پَورٹل</a> ملاحظہ کریں)'
-    discord_secret: 'ڈِسکَورڈ سیکرٹ کی۔'
+    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: "ایڈمِنِسٹریٹروں کو فورم کے بیک اَپ بنانے کی اجازت دیں"
@@ -1750,7 +1747,7 @@ ur:
     embed_username_required: "ٹاپک کی تخلیق کیلئے صارف نام ضروری ہے۔"
     notify_about_flags_after: "اگر ایسے فلَیگ موجود ہیں جن پر اتنے گھنٹوں کے بعد بھی کام نہیں کیا جا سکا، تو ماڈریٹرز کو ذاتی پیغام بھیجیں۔ غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
     show_create_topics_notice: "اگر سائٹ میں 5 سے کم عوامی ٹاپک موجود ہیں، تو کچھ ٹاپک تخلیق کرنے کیلئے منتظمین کو ایک نوٹس دکھائیں۔"
-    delete_drafts_older_than_n_days: (ن) دنوں سے پرانے ڈرافٹ حذف کریں۔
+    delete_drafts_older_than_n_days: "(ن) دنوں سے پرانے ڈرافٹ حذف کریں۔"
     bootstrap_mode_min_users: "بُوٹسٹرَیپ مَوڈ غیر فعال کرنے کیلئے درکار صارفین کی کم از کم تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
     prevent_anons_from_downloading_files: "گمنام صارفین کو اٹَیچمنٹس ڈاؤن لوڈ کرنے سے روکیں۔ انتباہ: ایسا کرنے سے کوئی بھی غیر تصویر سائٹ کے اثاثہ جات، جو اٹَیچمنٹ کے طور پرشائع کیے گئے ہوں، بھی کام کرنا چھوڑ دیں گے۔"
     slug_generation_method: "سلَگ تخلیق کا طریقہ منتخب کریں۔ 'انکوڈ کردہ' فیصد انکوڈِنگ سٹرِنگ تخلیق کرے گ۔. 'کوئی بھی نہیں' سلَگ کو غیر فعال کر دے گا۔"
@@ -2153,10 +2150,6 @@ ur:
   admin_confirmation_mailer:
     title: "ایڈمن کی توثیق"
     subject_template: "[%{email_prefix}] نئے ایڈمن اکاؤنٹ کی توثیق کریں"
-    text_body_template: |
-      براہ مہربانی تصدیق کریں کہ آپ **%{target_username}** کو اپنے فورَم کے ایڈمِنِسٹریٹر کے طور پر شامل کرنا چاہتے ہیں۔
-
-      [ایڈمِنِسٹریٹر اکاؤنٹ کی تصدیق کریں](%{admin_confirm_url})
   test_mailer:
     title: "مَیلر ٹیسٹ کریں"
     subject_template: "[%{email_prefix}] ای میل قابل ترسیل ہونے کا ٹیسٹ"
@@ -2778,36 +2771,6 @@ ur:
     visit_link_to_respond_pm: "[پیغام وِزِٹ کریں](%{base_url}%{url}) %{participants} کا جواب دینے کیلئے۔"
     posted_by: "%{post_date} کو %{username} نے پوسٹ کیا"
     pm_participants: "شرکاء: %{participants}"
-    invited_group_to_private_message_body: |
-      %{inviter_name} نے %{group_name} کو ایک پیغام پر مدعو کیا
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      پر
-
-      > %{site_title}-- %{site_description}
-    invited_to_private_message_body: |
-      %{inviter_name} نے آپ کو ایک پیغام پر مدعو کیا
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      پر
-
-      > %{site_title}-- %{site_description}
-    invited_to_topic_body: |
-      %{inviter_name} نے آپ کو ایک بحث پر مدعو کیا
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      پر
-
-      > %{site_title}-- %{site_description}
     user_invited_to_private_message_pm_group:
       title: "صارف نے گروپ ذاتی پیغام میں مدعو کیا"
       subject_template: "[%{email_prefix}]%{username} نے @%{group_name} کو پیغام '%{topic_title}' میں مدعو کیا"
@@ -3188,7 +3151,6 @@ ur:
     missing: "معذرت، ہم اس ای میل ایڈریس سے منسلک کوئی اوتار تلاش نہیں کر سکے۔ کیا آپ اُسے دوبارہ اَپ لوڈ کرنے کی کوشش کر سکتے ہیں؟"
   flag_reason:
     sockpuppet: "ایک نئے صارف نے ایک ٹاپک بنایا، اور اُسی IP ایڈریس (%{ip_address}) پر ایک نئے صارف نے جواب دیا۔ `flag_sockpuppets` سائٹ ترتیب دیکھیے۔"
-    spam_hosts: "اِس نئے صارف ایک ہی ڈومَین (%{domain}) کے لِنکس کے ساتھ کئی پوسٹس تخلیق کرنے کی کوشش کی۔ <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> سائٹ کی ترتیب دیکھیے۔"
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user سے تجاوز کر گیا"
     exceeded_bounces_limit: "bounce_score_threshold سے تجاوز کر گیا"
@@ -3968,4 +3930,4 @@ ur:
   email_style:
     html_missing_placeholder: "HTML ٹَیمپلیٹ میں %{placeholder} کا شامل ہونا لاذمی ہے۔"
   discord:
-    not_in_allowed_guild: 'تصدیق میں ناکامی۔ آپ کسی اجازت یافتہ ڈِسکَورڈ گِلڈ کے ممبر نہیں ہیں۔'
+    not_in_allowed_guild: "تصدیق میں ناکامی۔ آپ کسی اجازت یافتہ ڈِسکَورڈ گِلڈ کے ممبر نہیں ہیں۔"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 8c98f4f86f..c195f1791a 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -39,7 +39,6 @@ vi:
         no_message_id_error: "Xảy ra khi thư không có phần 'Message-Id'."
         auto_generated_email_error: "Xảy ra khi tiêu đề 'ưu tiên' được đặt là: danh sách, rác, theo lô hoặc tự động trả lời, hoặc khi có tiêu đề khác bao gồm: tự động gửi, tự động trả lời hoặc tự động tạo."
         inactive_user_error: "Xảy ra khi người gửi không hoạt động."
-        bad_destination_address: "Xảy ra khi không có địa chỉ email trong các trường Tới/Cc/Bcc khớp với địa chỉ email đến đã được cấu hình."
         strangers_not_allowed_error: "Xảy ra khi người dùng cố tạo chủ đề mới trong một danh mục mà họ không phải là thành viên."
         insufficient_trust_level_error: "Xảy ra khi người dùng cố tạo chủ đề mới trong một danh mục mà họ chưa đủ cấp độ tin cậy."
         reply_user_not_matching_error: "Xảy ra khi trả lời đến từ một địa chỉ email khác với thông báo được gửi đến."
@@ -891,7 +890,7 @@ vi:
     embed_post_limit: "Số lượng tối đa bài viết được nhúng."
     embed_username_required: "Tên tài khoản để tạo chủ đề là bắt buộc."
     show_create_topics_notice: "Nếu trang có ít hơn 5 chủ đề công khai, hiển thị một thông báo yêu cầu quản trị tạo thêm các chủ đề mới"
-    delete_drafts_older_than_n_days: Xóa các bản nháp cũ hơn (n) ngày.
+    delete_drafts_older_than_n_days: "Xóa các bản nháp cũ hơn (n) ngày."
     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"
     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"
@@ -1112,26 +1111,6 @@ vi:
       description: "Bạn không thích nhận mail giống mail này? Nhấn vào bỏ theo dõi để bỏ đăng ký ngay lập tức:"
     only_reply_by_email: "Trả lời email này để phản hồi."
     posted_by: "Đăng bởi %{{username} ngày %{post_date}"
-    invited_to_private_message_body: |
-      %{username} mời bạn xem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tại
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} mời bạn thảo luận
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tại
-
-      > %{site_title} -- %{site_description}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 33ee0f7cc8..34515cd3c9 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -49,6 +49,7 @@ zh_CN:
       about_json_values: "about.json包含无效值：%{errors}"
       git: "克隆 git 版本库时出错，访问被拒绝或找不到版本库"
       unpack_failed: "无法解压缩文件"
+      file_too_big: "未压缩的文件太大。"
       unknown_file_type: "你上传的文件似乎不是可用的 Discourse 主题。"
     errors:
       component_no_user_selectable: "主题组件不能由用户选择"
@@ -91,7 +92,7 @@ zh_CN:
         from_reply_by_address_error: "当From标头与电子邮件地址的回复匹配时发生。"
         inactive_user_error: "发送者未激活。"
         silenced_user_error: "当发件人被禁言时发生。"
-        bad_destination_address: "发至/抄送/密送栏中的所有邮件都不匹配进站邮件地址。"
+        bad_destination_address: "当“收件人/抄送”字段中的电子邮件地址与配置的传入电子邮件地址不匹配时发生。"
         strangers_not_allowed_error: "用户尝试在非成员分类中创建主题。"
         insufficient_trust_level_error: "用户尝试在用户等级不满足分类要求时发帖。"
         reply_user_not_matching_error: "回复邮箱地址与通知发送至的邮件地址不同。"
@@ -155,6 +156,7 @@ zh_CN:
       invalid_choice:
         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。"
       s3_backup_requires_s3_settings: "除非你提供了'%{setting_name}'，否则无法将S3用作备份位置。"
@@ -204,7 +206,11 @@ zh_CN:
   email_template_cant_be_modified: "无法修改此邮件模板"
   invalid_whisper_access: "没有启用密语，或者你无权创建谜语帖子"
   not_in_group:
+    title_topic: "你必须在群组中才能看到此主题。"
+    title_category: "你必须在群组中才能看到此分类。"
+    request_membership: "申请会员"
     join_group: "加入群组"
+  deleted_topic: "糟糕！该主题已被删除且不再可用。"
   reading_time: "阅读时间"
   likes: "赞"
   too_many_replies:
@@ -232,6 +238,7 @@ zh_CN:
       other: "%{count}赞"
     last_reply: "最新回复"
     created: "创建时间"
+    new_topic: "创建新主题"
   no_mentions_allowed: "抱歉，你无法提到其他用户。"
   too_many_mentions:
     other: "抱歉，你一次仅能提到 %{count} 个用户。"
@@ -685,7 +692,7 @@ zh_CN:
     activated: "抱歉，这个账户已经被激活了。"
     admin_confirm:
       title: "确认管理员账户"
-      description: "你确定要设置<b>%{target_username}</b>为管理员吗？"
+      description: "你确定要将<b>%{target_username}（%{target_email}）</b>设为管理员吗？"
       grant: "授予管理员权限"
       complete: "<b>%{target_username}</b>现在是管理员了。"
       back_to: "返回%{title}"
@@ -734,6 +741,13 @@ zh_CN:
       description: "赞本帖"
       short_description: "赞该贴"
       long_form: "赞本帖内容"
+  draft:
+    sequence_conflict_error:
+      title: "草稿错误"
+      description: "草稿正在其它窗口中被编辑。请重新加载此页面。"
+  draft_backup:
+    pm_title: "将正在的编辑中的主题备份为草稿"
+    pm_body: "主题包含备份的草稿"
   user_activity:
     no_default:
       self: "你还没有活动。"
@@ -749,6 +763,18 @@ zh_CN:
       others: "无回复"
     no_drafts:
       self: "你没有草稿；任何主题中撰写回复，它将自动保存为新草稿。"
+  webauthn:
+    validation:
+      invalid_type_error: "提供的webauthn类型无效。有效类型为webauthn.get和webauthn.create。"
+      invalid_origin_error: "身份验证请求的来源与源服务器不匹配。"
+      malformed_attestation_error: "解码验证数据时出错。"
+      user_verification_error: "需要用户验证。"
+      unsupported_public_key_algorithm_error: "服务器不支持所提供公钥的算法。"
+      unsupported_attestation_format_error: "服务器不支持的证明格式。"
+      credential_id_in_use_error: "提供的凭据ID已在使用中。"
+      public_key_error: "凭据的公钥验证失败。"
+      ownership_error: "安全密钥不归用户所有。"
+      not_found_error: "找不到具有提供凭据ID的安全密钥。"
   topic_flag_types:
     spam:
       title: "垃圾"
@@ -1388,8 +1414,8 @@ zh_CN:
     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: "Github身份验证的客户端ID，在<a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>中注册"
     github_client_secret: "Github身份验证的客户端secret，在<a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>上注册"
-    enable_discord_logins: '允许用户使用DIscord认证？'
-    discord_secret: 'Discord Secret Key'
+    enable_discord_logins: "允许用户使用DIscord认证？"
+    discord_secret: "Discord Secret Key"
     readonly_mode_during_backup: "备份时启用只读模式"
     enable_backups: "允许管理员创建论坛备份"
     allow_restore: "允许导入数据，这将能替换所有全站数据！除非你计划导入数据，否则请保持设置为 false"
@@ -1594,8 +1620,14 @@ zh_CN:
     reset_bounce_score_after_days: "自动在 X 天后重置累计退信分值。"
     attachment_content_type_blacklist: "基于 content type 禁止附件的黑名单列表。"
     attachment_filename_blacklist: "基于文件名禁止附件的黑名单列表。"
+    forwarded_emails_behaviour: "如何处理转发给Discourse的电子邮件"
     always_show_trimmed_content: "总是显示进站邮件中被截断的部分。警告：可能显示某些邮件地址。"
     private_email: "不要在邮件标题和主体中包含帖子或主题的内容。注意：会一并关闭摘要邮件。"
+    email_total_attachment_size_limit_kb: "出站邮件所有附件合计的最大尺寸。设置为0禁止发送附件。"
+    post_excerpts_in_emails: "在通知邮件中总是发送摘要代替帖子全文。"
+    raw_email_max_length: "应该被保存的入站邮件字符数量。"
+    raw_rejected_email_max_length: "应该被保存的被拒收的入站邮件字符数量。"
+    delete_rejected_email_after_days: "删除（n）天之前被拒收的邮件。"
     manual_polling_enabled: "用 API 推送邮件回复。"
     pop3_polling_enabled: "轮询 POP3 收取邮件回复。"
     pop3_polling_ssl: "连接至 POP3 服务器时使用 SSL。（推荐）"
@@ -1632,6 +1664,7 @@ zh_CN:
     suppress_digest_email_after_days: "停止给(n)天未登录网站的用户发送摘要邮件。"
     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”）。"
@@ -1653,6 +1686,7 @@ zh_CN:
     ignored_users_count_message_threshold: "当一个用户被很多用户忽视时通知版主。"
     ignored_users_message_gap_days: "当一个用户被很多用户忽视时再次通知版主要等待多久。"
     clean_up_inactive_users_after_days: "非活跃用户（信任等级0且没有任何帖子）被删除前等待的天数。设为0则关闭清理。"
+    user_selected_primary_groups: "允许用户设置其主要群组"
     user_website_domains_whitelist: "用户网站要属于这些域名中。用 | 分割。"
     allow_profile_backgrounds: "允许用户上传个人资料背景图片。"
     sequential_replies_threshold: "在被提醒回复了太多连续的回复前，用户在主题中可以连续回复的帖子的数量。"
@@ -1694,7 +1728,7 @@ 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: "禁止匿名用户下载附件。警告：这将禁止他们访问任何发表在帖子中的非图片资源。"
     slug_generation_method: "选择一个链接生成方式。“encoded”将生成以百分号编码的链接。“none”将禁用自定义链接，只生成默认链接。"
@@ -1739,6 +1773,10 @@ zh_CN:
     default_categories_tracking: "分类列表默认追踪。"
     default_categories_muted: "分类列表默认不显示。"
     default_categories_watching_first_post: "默认关注该分类中每个新主题的第一条贴子"
+    default_tags_watching: "默认监看的标签列表。"
+    default_tags_tracking: "默认追踪的标签列表。"
+    default_tags_muted: "默认静音的标签列表。"
+    default_tags_watching_first_post: "监看主题首个回复的标签列表。"
     default_text_size: "默认选择的文本大小"
     default_title_count_mode: "页面标题计算器的默认模式"
     retain_web_hook_events_period_days: "保存 web hook 事件记录的天数。"
@@ -1831,6 +1869,8 @@ zh_CN:
       topic: "结果"
       user: "用户"
     results_page: "关于“%{term}”的搜索结果"
+    audio: "[音频]"
+    video: "[视频]"
   sso:
     login_error: "登录错误"
     not_found: "无法找到你的账户。请联系站点管理人员。"
@@ -1896,6 +1936,11 @@ zh_CN:
     autoclosed_disabled_lastpost: "本主题现在开放了。可以添加新的回复。"
     auto_deleted_by_timer: "由计时器自动删除。"
   login:
+    security_key_alternative: "找不到您的安全密钥，是否要使用其他方法？"
+    security_key_authenticate: "使用安全密钥进行身份验证"
+    security_key_not_allowed_error: "安全密钥验证超时或被取消。"
+    security_key_no_matching_credential_error: "在提供的安全密钥中找不到匹配的凭据。"
+    security_key_invalid: "验证安全密钥时出错。"
     not_approved: "你的账户尚未获得批准。一旦你的账户获得批准，你会收到一封电子邮件。"
     incorrect_username_email_or_password: "用户名、电子邮箱或密码不正确"
     incorrect_password: "密码错误"
@@ -1914,6 +1959,7 @@ zh_CN:
       generic: "抱歉，您的帐户授权时出错。请重试。"
       csrf_detected: "授权超时，或者您已切换浏览器。请重试。"
       request_error: "授权时发生错误。请重试。"
+      invalid_iat: "由于服务器时钟差异，无法验证授权令牌。请重试。"
     omniauth_error_unknown: "在处理你的登录过程中发生了错误，请重试。"
     omniauth_confirm_title: "使用%{provider}登录"
     omniauth_confirm_button: "继续"
@@ -1931,6 +1977,7 @@ zh_CN:
     second_factor_backup_description: "请输入备用码："
     second_factor_backup_title: "两步验证备用码"
     invalid_second_factor_code: "验证码无效。每个代码只能使用一次。"
+    invalid_security_key: "无效的安全密钥。"
     second_factor_toggle:
       totp: "改用身份验证APP"
       backup_code: "使用备份码"
@@ -1947,6 +1994,7 @@ zh_CN:
       short: "必须超过 %{min} 个字"
       long: "必须不超过 %{max} 个字"
       too_long: "太长"
+      characters: "必须仅包含数字、字母、破折号、点和下划线"
       unique: "已被使用"
       blank: "必须存在"
       must_begin_with_alphanumeric_or_underscore: "必须以字母、数字或下划线开头"
@@ -2076,10 +2124,6 @@ zh_CN:
   admin_confirmation_mailer:
     title: "管理员确认"
     subject_template: "[%{site_name}] 确认新管理员账户"
-    text_body_template: |
-      请确认你想要将**%{target_username}**设为你论坛的管理员。
-
-      [确认管理员账户](%{admin_confirm_url})
   test_mailer:
     title: "测试发件人"
     subject_template: "[%{email_prefix}] 邮件可达性测试"
@@ -2181,6 +2225,18 @@ zh_CN:
     flags_disagreed:
       title: "管理人员恢复了被标记的帖子"
       subject_template: "管理人员恢复了被标记的帖子"
+      text_body_template: |
+        你好，
+
+        这是来自%{site_name}的自动消息，[你的贴子](%{base_url}%{url})已被恢复。
+
+        此贴曾被社区标记过，管理人员选择将其恢复。
+
+        [详情=“点击展开被恢复的贴子”]
+        ```markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
     flags_agreed_and_post_deleted:
       title: "管理人员删除了已标记的帖子"
       subject_template: "管理人员删除了已标记的帖子"
@@ -2222,6 +2278,9 @@ zh_CN:
         嘿。我们看到你一直在忙着阅读，这太棒了，所以我们已经提升你了[信任等级！](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
 
         我们很高兴你和我们共度时光，我们很想知道更多关于你的事情。花一点时间[填写你的个人资料](%{base_url}/我的/设置/个人信息)，或随时[开始一个新主题](%{base_url}/categories)。
+    welcome_moderator:
+      title: "欢迎版主"
+      subject_template: "恭喜，你现在是版主了！"
     welcome_invite:
       title: "欢迎邀请"
       subject_template: "欢迎来到 %{site_name}！"
@@ -2652,35 +2711,47 @@ zh_CN:
     posted_by: "%{username}发表于%{post_date}"
     pm_participants: "参与者：%{participants}"
     invited_group_to_private_message_body: |
-      %{username} 邀请 @%{group_name} 至私信交流：
+      %{username}邀请@%{group_name}到私信
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      论坛：
+      位于
 
       > %{site_title} -- %{site_description}
+
+      点击以下链接加入私信：
+
+      %{topic_url}
     invited_to_private_message_body: |
-      %{username} 邀请你至私信交流：
+      %{username}邀请你参与私信
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      论坛：
+      位于
 
       > %{site_title} -- %{site_description}
+
+      点击以下链接加入私信：
+
+      %{topic_url}
     invited_to_topic_body: |
-      %{username} 邀请你参与讨论：
+      %{username}邀请你参与讨论
 
-      > **%{topic_title}**
+      > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      论坛：
+      位于
 
       > %{site_title} -- %{site_description}
+
+      点击以下链接加入讨论：
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "用户邀请群组至私信"
       subject_template: "[%{email_prefix}] %{username}邀请 @%{group_name} 加入消息交流：“%{topic_title}”"
@@ -3057,7 +3128,7 @@ zh_CN:
     missing: "抱歉，我们没法找到与你邮件地址关联的头像。你能再上传一次试试吗？"
   flag_reason:
     sockpuppet: "新用户创建了主题，而另一个新用户以同一个 IP 在该主题回复。查看站点设置的 <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
-    spam_hosts: "新用户试图在多个创建帖子中发表链接到同一个域名的内容。查看站点设置的 <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
+    spam_hosts: "新用户尝试创建多个链接到相同域名的帖子。此用户所有包含链接的帖子需要审核。详见站点设置<a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
   skipped_email_log:
     exceeded_emails_limit: "超过max_emails_per_day_per_user"
     exceeded_bounces_limit: "超过bounce_score_threshold"
@@ -3727,6 +3798,8 @@ zh_CN:
       in_this_category: '"%{tag_name}不能用于此类别"'
       restricted_to:
         other: '“%{tag_name}”被限制在以下分类：%{category_names}'
+    required_tags_from_group:
+      other: "你必须选择至少%{count}个%{tag_group_name}标签。"
   rss_by_tag: "主题标签 %{tag}"
   finish_installation:
     congratulations: "祝贺，你已经安装好了 Discourse！"
@@ -4004,4 +4077,4 @@ zh_CN:
   email_style:
     html_missing_placeholder: "HTML模板必须包含%{placeholder}"
   discord:
-    not_in_allowed_guild: '验证失败。您不是允许的Discord公会的成员。'
+    not_in_allowed_guild: "验证失败。您不是允许的Discord公会的成员。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 31b5050985..4beb44a1b3 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -89,7 +89,6 @@ zh_TW:
         from_reply_by_address_error: "當「來自」標頭的 email 與回覆的 email 相符時會發生。"
         inactive_user_error: "當寄件者處於非啟動狀態時發生。"
         silenced_user_error: "當寄件者被禁言時會發生。"
-        bad_destination_address: "發至/抄送/密送欄中的所有郵件都不匹配進站郵件地址。"
         strangers_not_allowed_error: "當使用者試圖在尚未晉身為成員之一的分類中新建討論話題時發生。"
         insufficient_trust_level_error: "使用者嘗試在使用者等級不滿足分類要求時發帖。"
         reply_user_not_matching_error: "回覆郵箱地址與通知發送至的郵件地址不同。"
@@ -666,7 +665,6 @@ zh_TW:
     activated: "抱歉，這個帳號已被啟用。"
     admin_confirm:
       title: "確認管理員帳號"
-      description: "您是否確定要讓<b>%{target_username}</b>成為管理員？"
       grant: "授予管理員存取權"
       complete: "<b>%{target_username}</b>現在是管理員了"
       back_to: "回到%{title}"
@@ -1654,7 +1652,7 @@ zh_TW:
     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: "禁止匿名使用者下載附件。警告：這將禁止他們訪問任何發表在貼文中的非圖片資源。"
     slug_generation_method: "選擇一個連結生成方式。“encoded”將生成以百分號編碼的連結。“none”將禁用自定義連結，只生成預設連結。"
@@ -2021,10 +2019,6 @@ zh_TW:
   admin_confirmation_mailer:
     title: "管理員確認"
     subject_template: "[%{email_prefix}] 確認新的管理員帳號"
-    text_body_template: |
-      請確認您要將 **%{target_username}** 作為 Discourse 論壇的管理員
-
-      [確認管理員帳戶](%{admin_confirm_url})
   test_mailer:
     title: "測試 Mailer"
     subject_template: "[%{email_prefix}] 電子郵件發送測試"
@@ -2559,27 +2553,6 @@ zh_TW:
     visit_link_to_respond_pm: "[查看訊息](%{base_url}%{url}) 以回應%{participants}。"
     posted_by: "由 %{username} 張貼於 %{post_date}"
     pm_participants: "參與者：%{participants}"
-    invited_group_to_private_message_body: "%{username}邀請@%{group_name}收訊息\n\n> ** %{topic_title}** \n>\n> %{topic_excerpt} \n\n在\n \n> %{site_title} - %{site_description}\n"
-    invited_to_private_message_body: |
-      %{username} 邀請你至消息交流：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      論壇：
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username}邀請你參與
-
-      > %{site_title}－%{site_description}
-
-      的討論話題
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
     user_invited_to_private_message_pm_group:
       title: "使用者邀請群組至私人訊息"
       subject_template: "[%{email_prefix}] %{username} 邀請 @%{group_name} 參與討論「%{topic_title}」"
@@ -2925,7 +2898,6 @@ zh_TW:
     missing: "抱歉，我們沒法找到與你郵件地址關聯的頭像。你能再上傳一次試試嗎？"
   flag_reason:
     sockpuppet: "新使用者創建了主題，而另一個新使用者以同一個 IP 在該主題回覆。查看站點設置的 <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
-    spam_hosts: "新使用者試圖在多個創建貼文中發錶鏈接到同一個域名的內容。查看站點設置的 <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
   skipped_email_log:
     exceeded_emails_limit: "超過 max_emails_per_day_per_user"
     exceeded_bounces_limit: "超過 bounce_score_threshold"
diff --git a/plugins/discourse-details/config/locales/client.uk.yml b/plugins/discourse-details/config/locales/client.uk.yml
index e6bc96fa63..33382569a1 100644
--- a/plugins/discourse-details/config/locales/client.uk.yml
+++ b/plugins/discourse-details/config/locales/client.uk.yml
@@ -7,5 +7,8 @@
 
 uk:
   js:
+    details:
+      title: Сховати деталі
     composer:
       details_title: Підсумок
+      details_text: "Цей текст буде приховано"
diff --git a/plugins/discourse-details/config/locales/server.da.yml b/plugins/discourse-details/config/locales/server.da.yml
index 9e44b532c7..18d2178d2b 100644
--- a/plugins/discourse-details/config/locales/server.da.yml
+++ b/plugins/discourse-details/config/locales/server.da.yml
@@ -7,6 +7,6 @@
 
 da:
   site_settings:
-    details_enabled: "Aktivér detaljeringsfunktionen. Hvis du ændrer dette, skal du omdirigere alle indlæg med: \"rake posts:rebake\"."
+    details_enabled: "Aktivér 'detaljer' funktion. Hvis du gennemfører denne ændring, skal du omdirigere alle indlæg med: \"rake posts:rebake\"."
   details:
     excerpt_details: "(klik for flere detaljer)"
diff --git a/plugins/discourse-details/config/locales/server.en.yml b/plugins/discourse-details/config/locales/server.en.yml
index 36bed99116..0e783318ea 100644
--- a/plugins/discourse-details/config/locales/server.en.yml
+++ b/plugins/discourse-details/config/locales/server.en.yml
@@ -1,5 +1,5 @@
 en:
   site_settings:
-    details_enabled: "Enable the details feature. If you change this, you must rebake all posts with: \"rake posts:rebake\"."
+    details_enabled: 'Enable the details feature. If you change this, you must rebake all posts with: "rake posts:rebake".'
   details:
     excerpt_details: "(click for more details)"
diff --git a/plugins/discourse-details/config/locales/server.nl.yml b/plugins/discourse-details/config/locales/server.nl.yml
index 3f9ec744c2..bdccfcc22e 100644
--- a/plugins/discourse-details/config/locales/server.nl.yml
+++ b/plugins/discourse-details/config/locales/server.nl.yml
@@ -8,3 +8,5 @@
 nl:
   site_settings:
     details_enabled: "De details-functie inschakelen. Als u dit wijzigt, moet u alle berichten opnieuw opbouwen met: 'rake posts:rebake'."
+  details:
+    excerpt_details: "(klik voor meer details)"
diff --git a/plugins/discourse-details/config/locales/server.uk.yml b/plugins/discourse-details/config/locales/server.uk.yml
index 3acfff74e8..ecedaf9a52 100644
--- a/plugins/discourse-details/config/locales/server.uk.yml
+++ b/plugins/discourse-details/config/locales/server.uk.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  site_settings:
+    details_enabled: "Увімкніть функцію деталей. Якщо змінити, то потрібно відредагувати всі дописи: &quot;rake posts:rebake&quot;."
+  details:
+    excerpt_details: "(натисніть для отримання детальної інформації)"
diff --git a/plugins/discourse-local-dates/config/locales/client.uk.yml b/plugins/discourse-local-dates/config/locales/client.uk.yml
index fbf3dfd5f8..6bf7c007ea 100644
--- a/plugins/discourse-local-dates/config/locales/client.uk.yml
+++ b/plugins/discourse-local-dates/config/locales/client.uk.yml
@@ -8,7 +8,36 @@
 uk:
   js:
     discourse_local_dates:
+      relative_dates:
+        today: Сьогодні %{time}
+        tomorrow: Завтра %{time}
+        yesterday: Вчора %{time}
+        countdown:
+          passed: дата минула
+      title: Вставити дату / час
       create:
         form:
+          insert: Вставити
+          advanced_mode: Розширений режим
+          simple_mode: Простий режим
+          format_description: "Формат, який використовується для відображення дати користувачеві. Використовуйте &quot;\\T\\Z&quot;, щоб відобразити часовий пояс користувача словами (Європа/Париж)"
+          timezones_title: Часові пояси показати
+          timezones_description: Часові пояси будуть використовуватися для відображення дат у попередньому та резервному режимі.
+          recurring_title: Повторення
+          recurring_description: "Визначте повторення події. Ви можете вручну редагувати повторюваний параметр, створений формою, і скористатися однією з таких клавіш: роки, квартали, місяці, тижні, дні, години, хвилини, секунди, мілісекунди."
+          recurring_none: Без повторів
+          invalid_date: Недійсна дата, переконайтесь, що дата та час є правильними
           date_title: Дата
-          time_title: Time
+          time_title: Час
+          format_title: Формат дати
+          timezone: Часовий пояс
+          until: Поки...
+          recurring:
+            every_day: "Щодня"
+            every_week: "Щотижня"
+            every_two_weeks: "Кожні два тижні"
+            every_month: "Щомісяця"
+            every_two_months: "Кожні два місяці"
+            every_three_months: "Кожні три місяці"
+            every_six_months: "Кожні півроку"
+            every_year: "Щороку"
diff --git a/plugins/discourse-local-dates/config/locales/server.uk.yml b/plugins/discourse-local-dates/config/locales/server.uk.yml
index 3acfff74e8..d42febdfae 100644
--- a/plugins/discourse-local-dates/config/locales/server.uk.yml
+++ b/plugins/discourse-local-dates/config/locales/server.uk.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  site_settings:
+    discourse_local_dates_enabled: "Увімкніть функцію discourse-local-dates дат. Це додасть підтримку місцевим датам у публікаціях із використанням елемента [date]."
+    discourse_local_dates_default_formats: "Найчастіші формати дати, див .: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>формат рядка momentjs</a>"
+    discourse_local_dates_default_timezones: "Список часових поясів за замовчуванням повинен бути дійсним <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
+    discourse_local_dates_email_format: "Формат, який використовується для відображення дати в електронних листах."
diff --git a/plugins/discourse-narrative-bot/config/locales/client.da.yml b/plugins/discourse-narrative-bot/config/locales/client.da.yml
index f07f7412cb..8c438aaa8a 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.da.yml
@@ -9,5 +9,5 @@ da:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Start opstartsvejledningen for alle nye brugere"
-        welcome_message: "Send en velkomstbesked til alle nye brugere med en opstartsguide"
+        new_user_track: "Påbegynd 'ny bruger' vejledningen for alle nye brugere"
+        welcome_message: "Send en velkomsts besked til alle nye brugere med en opstartsguide"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 0b7027e2b4..90b2e33fec 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -111,15 +111,6 @@ ar:
       random_mention:
         reply: |-
           مرحباً, لتكتشف ما استطيع ان افعلة, قل `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3.6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :speech_balloon: _قم بعمل الخير دون انتظار الأجر, و آمن انه يوما ما سيقوم احدهم برد هذا الخير لك_ &mdash; الأميرة ديانا
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: يمكنك الاعتماد علية
       do_not_understand:
         first_response: |-
           مرحباً, شكرا علي الرد!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.be.yml b/plugins/discourse-narrative-bot/config/locales/server.be.yml
index 9dcf47f456..0268de26e4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.be.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.be.yml
@@ -105,8 +105,6 @@ be:
       random_mention:
         reply: |-
           Прывітанне! Для таго, каб высветліць, што я магу зрабіць, скажам, `@% {discobot_username}% {help_trigger}`.
-        bot_actions: |-
-          `@% {Discobot_username}% {} dice_trigger 2d6`>: Game_die: 3, 6`@% {Discobot_username}% {quote_trigger}`>: Left_speech_bubble: _Carry з выпадковага акта дабрыні, без чакання ўзнагароды, упэўненага ў тым, што адзін дзень хто-то маглі б зрабіць тое ж самае для you_ & mdash; прынцэса Дыяна`@% {Discobot_username}% {magic_8_ball_trigger}`>: Crystal_ball: Вы можаце спадзявацца на яго
       do_not_understand:
         first_response: |-
           Гэй, дзякуй за адказ!На жаль, як дрэнна запраграмаваны робат, я не зусім разумею, што адзін. : Паныла:
@@ -180,8 +178,6 @@ be:
       search:
         instructions: |-
           _psst_ ... Я схаваны сюрпрыз ў гэтай тэме. Калі вы на гэты выклік, ** абярыце значок пошуку ** <IMG SRC = "% {base_uri}
-        hidden_message: |-
-          Як вы прапусцілі гэтую вадасвінкі? : Падморгваў:<IMG SRC = "% {base_uri}
         reply: |-
           Yay вы яго знайшлі: тада:- Для больш дэталёвага пошуку, зайдзіце на [паўнатэкставага пошуку старонкі] (% {search_url}).- Для таго, каб скакаць у любым месцы на працягу доўгага абмеркавання, паспрабуйце кіраванне тэмай па часовай шкале справа (і ўнізе, на мабільным тэлефоне).- Калі ў вас ёсць фізічны: клавіятура:, націсніце <KBD> <?
         not_found: |-
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 2e852d92e7..0b868c78ea 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -113,15 +113,6 @@ bs_BA:
       random_mention:
         reply: |-
           Pozdrav! Kako bi saznali šta sve mogu raditi, recite `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Pružite različit akt dobrote, bez očekivanja nagrade, znajući da će jednoga dana neko isto tako nešto moći uraditi za vas_ &mdash; Princeza Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Možeš na to osloniti
       do_not_understand:
         first_response: |-
           Hej, hvala za odgovor!
@@ -199,8 +190,6 @@ bs_BA:
       search:
         instructions: |-
           _psst_… Sakrio sam iznenađenje u ovoj temi. Ako ste spremni za izazov, ** odaberite ikonu za pretraživanje ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> gore desno ↗ da ga potražite. Pokušajte tražiti pojam &quot;capy bara&quot; u ovoj temi
-        hidden_message: |-
-          Kako ti nedostaje ova kapybara? : wink: \ t <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/> Da li ste primetili da ste se vratili na početak? Nahranite ovu siromašnu gladnu capybaru ** odgovorom sa `: herb:` emoji ** i automatski ćete se prebaciti na kraj.
         reply: |-
           Yay ste ga pronašli: tada: - Za detaljnije pretrage, pređite na [full search page] (%{search_url}). - Da biste skočili bilo gdje u dugoj diskusiji, pokušajte kontrolirati vremensku liniju teme desno (i na dnu, na mobitelu). - Ako imate fizičku tipkovnicu: pritisnite <kbd>?</kbd> da biste videli naše korisne prečice na tastaturi.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index a493fee9b0..8499bafac9 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -125,10 +125,10 @@ ca:
           > :game_die: 3, 6
 
           `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Porta a terme un acte aleatori de generositat, sense cap expectativa de recompensa, amb la certesa que qualsevol dia potser algú farà el mateix per tu_&mdash; Princesa Diana
+          %{quote_sample}
 
-          `@%{discobot_username}%{magic_8_ball_trigger}`
-          > :crystal_ball: Pots comptar-hi
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Podeu comptar-hi
       do_not_understand:
         first_response: |-
           Hola, gràcies per la resposta!
@@ -280,7 +280,7 @@ ca:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Us heu adonat que torneu a ser al principi? Doneu menjar a aquest pobre capibara **responent amb l'emoji `:herb:`** i sereu enviat automàticament al final.
+          Us heu adonat que torneu a ser al principi? Doneu menjar a aquest pobre capibara **responent amb l'emoji `%{search_answer}`emoji** i sereu enviat automàticament al final.
         reply: |-
           Visca, ho heu trobat :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.da.yml b/plugins/discourse-narrative-bot/config/locales/server.da.yml
index 3d56c936d4..72b87c0d51 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -111,15 +111,6 @@ da:
       random_mention:
         reply: |-
           Hej! For at finde ud af, hvad jeg kan gøre, skal du sige `@ %{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Gør en tilfældig, god gerning, uden at forvente belønning, i vished om at en dag vil nogen måske gøre det samme for dig._ &mdash; Prinsesse Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Det kan du stole på
       do_not_understand:
         first_response: |-
           Hej tak for svaret!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index bf79f1eb5e..3c19805ba8 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -118,15 +118,6 @@ 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}`
-          > :left_speech_bubble: _Wie angenehm ist es doch, freundlich zu sein! Ein gutes Wort entschlüpft wie ein wohliger Seufzer._ &mdash; Bertolt Brecht
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Darauf kannst du dich verlassen
       do_not_understand:
         first_response: |-
           Danke für die Antwort!
@@ -274,12 +265,6 @@ de:
           _Psst_… ich habe in diesem Thema eine Überraschung versteckt. Wenn du für eine Herausforderung zu haben bist, dann **wähle das Such-Symbol** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> oben rechts &#8599; aus und suche danach.
 
           Versuche, in diesem Thema nach dem Begriff „Capy&#8203;bara“ zu suchen.
-        hidden_message: |-
-          Wie konntest du das Capybara übersehen? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Hast du bemerkt, dass du jetzt zurück am Anfang bist? Füttere dieses arme, hungrige Capybara, indem du **mit dem `:herb:`-Emoji antwortest** und du wirst automatisch zum Ende gebracht.
         reply: |-
           Juhu! Du hast es gefunden :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 5df34a6f7f..4fa5cb0d4c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -111,15 +111,6 @@ el:
       random_mention:
         reply: |-
           Γεια σου! Για να μάθεις τι μπορώ να κάνω, πες `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Κάνε μια τυχαία πράξη καλωσύνης, χωρίς προσδοκία ή ανταμοιβή, απλά με την επίγνωση ότι κάποιος κάποια μέρα θα κάνει το ίδιο για σένα_ &mdash; Πριγκίπισσα Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Βασίσου πάνω του
       do_not_understand:
         first_response: |-
           Επ, ευχαριστώ για την απάντηση!
@@ -241,12 +232,6 @@ el:
           _ψιτ_ … Έχω κρύψει μια έκπληξη σε αυτό το νήμα. Αν είσαι μέσα και σε τρώει η περιέργεια, **πάτα το εικονίδιο αναζήτησης** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> επάνω δεξιά &#8599; για να την ψάξεις.
 
           Δοκίμασε να ψάξεις για τον όρο "capy&#8203;bara" σε αυτό το νήμα
-        hidden_message: |-
-          Πως αλήθεια σου ξέφυγε αυτός ο υδρόχειρος (capybara); :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Συνειδητοποίησες ότι έχεις επιστρέψει πίσω στην αρχή; Τάισε τον φτωχό και πεινασμένο υδρόχειρο **απαντώντας με το `:herb:` emoji** και αυτόματα θα μεταφερθείς στο τέλος.
         reply: |-
           Ναιιιι το βρήκες :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index b1e071923a..0e5c59a59c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -18,12 +18,12 @@ es:
       name: Certificado
       description: "Tutorial de usuario nuevo completado"
       long_description: |
-        Esta insignia se otorga al completar con éxito el tutorial interactivo para usuarios nuevos. ¡Tomaste la iniciativa de aprender las herramientas básicas de discusión y ahora estás certificado!
+        Esta medalla se otorga al completar con éxito el tutorial interactivo para usuarios nuevos. ¡Tomaste la iniciativa de aprender las herramientas básicas de discusión y ahora estás certificado!
     licensed:
       name: Con licencia
       description: "Tutorial de usuario avanzado completado"
       long_description: |
-        Esta insignia se otorga al completar con éxito el tutorial interactivo para usuarios avanzados. Has dominado las herramientas avanzadas de discusión y ¡ahora tienes licencia completa!
+        Esta medalla se otorga al completar con éxito el tutorial interactivo para usuarios avanzados. Has dominado las herramientas avanzadas de discusión y ¡ahora tienes licencia completa!
   discourse_narrative_bot:
     bio: "¡Hola! No soy una persona real, soy un bot que te puede enseñar acerca este sitio. Para interactuar conmigo, envíame un mensaje o menciona **`%{discobot_username}`** en cualquier lugar."
     timeout:
@@ -120,13 +120,13 @@ es:
           > Comienza un tutorial interactivo. `{nombre-del-tutorial}` puede ser uno de: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
-          >: game_die: 3, 6
+          > :game_die: 3, 6
 
           `@%{discobot_username} %{quote_trigger}`
-          >: left_speech_bubble: _Realizar un acto aleatorio de bondad, sin esperar recompensa, a sabiendas de que un día alguien podría hacer lo mismo por ti_ &mdash; princesa Diana
+          %{quote_sample}
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
-          >: crystal_ball: Puedes contar con ello
+          > :crystal_ball: Puedes contar con ello
       do_not_understand:
         first_response: |-
           ¡Hey, gracias por la respuesta!
@@ -150,7 +150,7 @@ es:
 
           - Solo soy un robot, pero [nuestro amigable staff](%{base_uri}/about) también está aquí para ayudarte si necesitas comunicarte con una persona.
 
-          - Por razones de seguridad, limitamos temporalmente lo que los nuevos usuarios pueden hacer. Obtendrás [nuevas habilidades](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (e [insignias](%{base_uri}/badges)) a medida que te conozcamos.
+          - Por razones de seguridad, limitamos temporalmente lo que los nuevos usuarios pueden hacer. Obtendrás [nuevas habilidades](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (y [medallas](%{base_uri}/badges)) a medida que te conozcamos.
 
           - Creemos en [el comportamiento de una comunidad civilizada](%{base_uri}/guidelines) en todo momento.
       onebox:
@@ -272,11 +272,11 @@ es:
 
           Trata de buscar el término «capi&#8203;bara» en este tema.
         hidden_message: |-
-          ¿Cómo no viste este capibara? :wink:
+          ¿Cómo pudiste pasar por alto este capibara? :wink:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          ¿Notaste que hemos vuelto al comienzo del tema? Alimenta este pobre y hambriento capibara **respondiendo con el emoji `:herb:`** y serás automáticamente enviado al final del tema.
+          ¿Notaste que estás de nuevo en el principio? Alimenta a este pobre capibara **respondiendo con el emoji de `%{search_answer}`** y esto te llevará automáticamente mente al final.
         reply: |-
           ¡Lo encontraste! :tada:
 
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 5a83ce93a3..7b49dd3f09 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -110,15 +110,6 @@ fa_IR:
       random_mention:
         reply: |-
           سلام! برای اینکه بفهمی من چکار میتوانم بکنم، بگو `@%{discobot_username} %{help_trigger} `.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger} `
-          > :left_speech_bubble: _کار نیکی انجام بده، بدون آنکه انتظار داشته باشی که پاداش بگیری، با این دیدگاه که ممکن است روزی فرد دیگری همین کار را برای شما انجام دهد_ &mdash; شاهزاده دایانا
-
-          `@%{discobot_username} %{magic_8_ball_trigger} `
-          > :crystal_ball: میتونی روش حساب کنی
       do_not_understand:
         first_response: |-
           سلام، متشکرم از پاسخی که دادی!
@@ -252,12 +243,6 @@ fa_IR:
           من در این مبحث یک سوپرایز برای شما دارم. اگر برای یک چالش آماده ای، **آیکون جستجو** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> را درگوشه ی بالا سمت چپ &#8598; انتخاب کن که جستجو اش بکنی.
 
           سعی کن که عبارت "سنجاب" را در این مبحث جستجو کنی
-        hidden_message: |-
-          چطور تونستی این سنجاب رو نادیده بگیری؟ :wink:
-
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
-
-          آیا متوجه شدی که الان تو در ابتدای مبحث هستی؟ به این سنجاب گرسنه‌ی بیچاره، با **پاسخ دادن توسط شکلک `:herb:`** (در پاسخ بنویس `:herb:`) غذا بده تا علاوه بر آن به صورت اتوماتیک به آخر مبحث برگردی.
         reply: |-
           بله پیداش کردی :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 2b60eaf4ba..b5a23f2c25 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -118,15 +118,6 @@ fi:
 
           `@%{discobot_username}%{reset_trigger}{name-of-tutorial}`
           > Aloittaa interaktiivisen kurssin. `{name-of-tutorial} ` voi olla jokin seuraavista: `%{tracks}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: dice roll: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Carry out a random act of kindness, with no expectation of reward, safe in the knowledge that one day someone might do the same for you_ &mdash; Prinsessa Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: En pysty sanomaan juuri nyt
       do_not_understand:
         first_response: |-
           Hei, kiitos kun vastasit!
@@ -274,12 +265,6 @@ fi:
           _psst_ … I’ve hidden a surprise in this topic. If you’re up for the challenge, **select the search icon** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> at the top right &#8599; to search for it.
 
           Try searching for the term "capy&#8203;bara" in this topic
-        hidden_message: |-
-          Miten sinulta jäi tämä kapybara huomaamatta? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Huomasitko, että palasit takaisin alkuun? Ruoki söpöä nälkäistä kapybaraa **vastaamalla `:herb:` -emojilla** niin sinut palautetaan automaattisesti takaisin loppuun.
         reply: |-
           Jes, löysit sen :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 477d0bfae6..1f6627f20d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -118,15 +118,6 @@ fr:
 
           `@%{discobot_username} %{reset_trigger} {nom-du-tutoriel}`
           > Débute un tutoriel interactif. `{nom-du-tutoriel}` est l'une des options suivantes : `%{tracks}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Les accolades peuvent faire beaucoup de bien... surtout pour les enfants._ &mdash; Princess Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Vous pouvez compter dessus
       do_not_understand:
         first_response: |-
           Hey, merci pour la réponse !
@@ -275,12 +266,6 @@ fr:
           _psst_ … J'ai caché une surprise dans ce sujet. Si vous aimez les challenges, sélectionnez **l’icône de recherche** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> en haut à droite &#8599; pour la trouver.
 
           Essayer de chercher le terme "capy​&#8203;bara" dans ce sujet.
-        hidden_message: |-
-          Comment avez-vous pu rater le capy​bara ? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Avez-vous remarqué que nous sommes maintenant revenu au début ? Nourrissez ce pauvre capybara en **répondant avec l'emoji `:herb:`** et vous serez automatiquement amené à la fin.
         reply: |-
           Vous l'avez trouvé :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 784289d61f..b744f4e6ba 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -123,10 +123,10 @@ he:
           > :game_die: 3, 6
 
           `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _ניקטו במעשה אקראי של חסד, ללא ציפייה לתמורה, בטוחים בידיעה שיום אחד מישהו עלול לעשות אותו הדבר בשבילכם_ &mdash; הנסיכה דיינה
+          %{quote_sample}
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: אתם יכולים לסמוך על כך
+          > :crystal_ball: אפשר לסמוך על זה
       do_not_understand:
         first_response: |-
           הי, תודה על התגובה!
@@ -275,11 +275,11 @@ he:
 
           יש לנסות לחפש את הביטוי „capy&#8203;bara” בנושא הזה
         hidden_message: |-
-          איך הצלחת לפספס את הקפיברה הזאת? :wink:
+          איך החמצת את הקפיברה הזאת? :wink:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          שמת לב שחזרת להתחלה? אולי נאכיל את הקפיברה המסכנה הזאת על ידי **השבה עם האמוג׳י `:herb:`** ומיד הדיון יוקפץ לסופו.
+          שמת לב שחזרת להתחלה? יש להאכיל את הקפיברה המסכנה על ידי שליחת תגובה עם ** האמוג׳י `%{search_answer}`** ומיד תתבצע הקפצה לסוף.
         reply: |-
           הידד! מצאת אותה :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hy.yml b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
index 7a4f51c66c..5e0aa6e867 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hy.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
@@ -113,15 +113,6 @@ hy:
       random_mention:
         reply: |-
           Բարև! Իմանալու համար, թե ինչ կարող եմ ես անել, հիշատակեք `@%{discobot_username} %{help_trigger}`:
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _ Որևէ բարություն արեք՝ առանց պարգևատրման սպասումների, իմանալով, որ երբևիցե որևէ մեկը կարող է անել նույնը Ձեզ համար _ &mdash; Արքայադուստր Դիանա
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Դուք կարող եք ապավինել դրան
       do_not_understand:
         first_response: |-
           Հեյ, շնորհակալություն պատասխանի համար!
@@ -259,12 +250,6 @@ hy:
           _պը՛տ_ … Ես անակնկալ եմ թաքցրել այս թեմայում: Եթե Ձեզ հետաքրքրում է այս մարտահրավերը, այն որոնելու համար **ընտրեք որոնման պատկերակը** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> վերևի աջ կողմում &#8599; :
 
           Փորձեք որոնել "ծովա&#8203;խոզուկ" տերմինը այս թեմայում:
-        hidden_message: |-
-          Ինչպե՞ս եք բաց թողել այս ծովախոզուկին :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Դուք նկատե՞ցիք, որ այժմ վերադարձել եք սկիզբ: Կերակրեք այս խեղճ փոքրիկ ծովախոզուկին` **պատասխանելով `:herb:` էմոջիով** և Դուք ավտոմատ կերպով կտեղափոխվեք դեպի վերջ:
         reply: |-
           Ուռա, Դուք գտաք այն! :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 358bf7e8e4..fb469fd114 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -110,15 +110,6 @@ id:
       random_mention:
         reply: |-
           Hei! Untuk tahu saya bisa melakukan apa, ketik `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Lakukan kebaikan apa saja tanpa pamrih, ingatlah kalau suatu hari seseorang mungkin melakukan yang sama kepada kamu_ &mdash; Princess Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Kamu mungkin bergantung padanya
       do_not_understand:
         first_response: |-
           Hei, terima kasih balasannya!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index d06e65a881..545166eaae 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -118,15 +118,6 @@ 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}`
-          > :left_speech_bubble: _Fare un atto di gentilezza casuale, senza nessuna aspettativa di ricompensa, con la certezza che un giorno qualcuno potrebbe fare lo stesso per te_ &mdash; Principessa Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Ci puoi contare
       do_not_understand:
         first_response: |-
           Hey, grazie per la risposta!
@@ -274,12 +265,6 @@ it:
           _psst_ … Ho nascosto una sorpresa in questo argomento. Se sei pronto alla sfida, **seleziona l'icona cerca** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> in alto a destra &#8599; per trovarla.
 
           Prova a cercare il termine "capi&#8203;bara" in questo argomento
-        hidden_message: |-
-          Come hai fatto a perderti questo capibara? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Hai notato che sei tornato all'inizio dell'argomento? Dai da mangiare a questo povero capibara affamato **rispondendo con la emoji `:herb:`** e tornerai automaticamente in fondo alla discussione.
         reply: |-
           Hey l'hai trovato :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 385492bb29..4ca9ebed78 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -112,15 +112,6 @@ ko:
       random_mention:
         reply: |-
           내가 뭘 할 수 있는지 알고 싶다면 `@%{discobot_username} %{help_trigger}` 라고 말하렴.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _언젠가 다른 누군가도 당신이 그랬던 것 처럼 친절한 행동을 할 거라고 믿으면서, 보상에 대한 어떠한 기대도 없이 친절한 행동을 하라._ &mdash; 다이애나비
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: 믿어도 좋아.
       do_not_understand:
         first_response: |-
           우와, 답글을 써줘서 고마워!
@@ -244,12 +235,6 @@ ko:
           이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> 선택해서 &#8599; 찾아봐.
 
           이 토픽에서 "capy&#8203;bara"를 찾으면 돼.
-        hidden_message: |-
-          어떻게 이 capybara를 잊을 수 있어? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          다시 처음으로 온 걸 눈치챘어? 이 배고픈 불쌍한 capybara에게 **`:herb:` emoji로 답을 해서** 먹이를 주렴. 그러면 자동으로 끝으로 가게 될거야.
         reply: |-
           예이, 찾았네! :tada:
 
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 8b942226b5..3b9a0544b6 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -111,15 +111,6 @@ nb_NO:
       random_mention:
         reply: |-
           Hei! Finn ut hva jeg kan gjøre, si `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Utfør gode gjerninger, uten forventning om belønning, trygg i vissheten om at noen en dag kanskje vil gjøre det samme for deg_ &mdash; Prinsesse Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Du kan stole på det
       do_not_understand:
         first_response: |-
           Hei, takk for svaret!
@@ -244,12 +235,6 @@ nb_NO:
           _psst_ ... jeg har gjemt en overraskelse et sted i dette emnet. Hvis du tar utfordringen, **trykk på søkeikonet** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> øverst til høyre &#8599; for å lete etter den.
 
           Prøv å søke etter ordet "capy&#8203;bara" i dette emnet
-        hidden_message: |-
-          Hvordan kunne du gå glipp av denne capybaraen? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          La du merke til at du er tilbake ved starten? Gi denne sultne capybaraen litt å spise ved å **svare med `:herb:` emojien**, da blir du automatisk tatt tilbake til slutten.
         reply: |-
           Hurra! Du fant den :tada:
 
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 5acbbf7fed..4cbc4d5650 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -120,14 +120,14 @@ pl_PL:
           > Zaczyna interaktywny samouczek. `{name-of-tutorial}` może być jednym z: `
           %{tracks}`.
         bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
+          `@ %{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
 
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Wykonuje losowy akt życzliwości, nie oczekując nagrody, wiedząc, że pewnego dnia ktoś może zrobić to samo dla Ciebie._ &mdash; Princess Diana
+          ` @ %{discobot_username} %{quote_trigger}`
+          %{quote_sample} `
 
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Możesz na niej polegać
+          `@%{discobot_username} %{magic_8_ball_trigger}
+          >:kryształowa_kula: Możesz na tym polegać
       do_not_understand:
         first_response: |-
           Hej! Dzięki za odpowiedź!
@@ -277,11 +277,11 @@ pl_PL:
 
           Spróbuj wyszukać frazę „kapibara” w tym wątku.
         hidden_message: |-
-          Jak udało Ci się pominąć tę kapibarę? :wink:
+          Jak tęskniłeś za tą kapibarą? :Puść oczko:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Zauważyłeś, że powróciliśmy na początek wątku? Nakarm tę biedną, głodną kapibarę, **odpowiadając z emoji :herb:**, a zostaniesz automatycznie przeniesiony na koniec wątku.
+          Zauważyłeś, że wróciłeś na początek? Nakarm tę biedną głodną kapibarę **, odpowiadając emoji `%{search_answer}` **, a zostaniesz automatycznie zabrany do końca.
         reply: |-
           Yay, udało Ci się to odnaleźć :tada:
 
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 f1425c3f6e..bc6545b011 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -113,15 +113,6 @@ pt_BR:
       random_mention:
         reply: |-
           Oi! Para descobrir o que eu posso fazer diga `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Realize um ato aleatório de bondade, sem expectativa de recompensa, seguro sabendo que um dia alguém poderá fazer o mesmo por você_ &mdash; Princesa Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Você pode confiar nela
       do_not_understand:
         first_response: |-
           Ei, obrigado pela resposta!
@@ -269,12 +260,6 @@ pt_BR:
           _xiiu_ … eu escondi uma surpresa neste tópico. Se você está pronto para o desafio, **selecione o ícone de pesquisa** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> no canto superior direito &#8599; para pesquisar por ela.
 
           Tente pesquisar pelo termo "capy&#8203;bara" (em inglês) neste tópico
-        hidden_message: |-
-          Como você não viu esta capivara? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Você percebeu que agora está de volta ao começo? Alimente esta pobre capivara faminta **respondendo com o emoji `:herb:`** e você será levado automaticamente para o final.
         reply: |-
           Yay você a encontrou :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 566cd85a49..bb61ef4045 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -113,15 +113,6 @@ ru:
       random_mention:
         reply: |-
           Привет! Tтобы узнать, что я могу сделать, наберите: `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Делайте добро, без ожидания награды, зная, что однажды кто-то может сделать то же самое для вас_ &mdash; Принцесса Диана
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Вы можете ответить на это
       do_not_understand:
         first_response: |-
           Спасибо за ответ!
@@ -269,12 +260,6 @@ ru:
           _Псс_ … Я спрятал сюрприз в этой теме. Если вы готовы принять вызов, **нажмите значок поиска** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> в верхнем правом углу &#8599; чтобы найти сюрприз.
 
           Попробуйте найти слово "capy&#8203;bara" в этой теме.
-        hidden_message: |-
-          Как же вы пропустили этого зверька капибара? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Вы заметили, что снова вернулись в самое начало поста? Покормите бедного, голодного капибару, **отправив смайлик `:herb:` ** и тогда вы автоматически вернетесь в конец.
         reply: |-
           Ура вы его нашли :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sk.yml b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
index 4550660d28..eb65dec779 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
@@ -110,15 +110,6 @@ sk:
       random_mention:
         reply: |-
           Ahoj! Ak chcete zistiť, čo dokážem urobiť, povedzte `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Vykonaj náhodný milosrdný skutok, bez akýchkoľvek očakávaní, a buď si istý, že jedného dňa niekto může urobiť to isté pre Teba_ &mdash; Princezná Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Na to sa môžeš spoľahnúť
       do_not_understand:
         first_response: |-
           Hej, ďakujem za odpoveď!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
index 9e7a0471e0..4a88f9ba70 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -113,15 +113,11 @@ sl:
       random_mention:
         reply: |-
           Pozdravljeni! Da izveste, kaj znam, recite `@%{discobot_username} %{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
+        tracks: |-
+          Trenutno znam narediti naslednje stvari:
 
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _Naredite naključno dejanje prijaznosti, brez pričakovanja nagrade, z zavedanjem da bo en dan mogoče nekdo to naredil vam._ &mdash; Princess Diana
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: Na to se lahko zanesete
+          `@%{discobot_username} %{reset_trigger} {naziv-pripovedi}`
+          > Začni interaktivno pripoved.  `{naziv-pripovedi}` je lahko ena od sledečih: %{tracks}.
       do_not_understand:
         first_response: |-
           Hvala za odgovor!
@@ -135,9 +131,19 @@ sl:
 
           Medtem vas ne bom motil.
     new_user_narrative:
+      reset_trigger: "vodič"
+      title: "Priznanje o opravljenem vodiču za novega uporabnika"
       cert_title: "Priznanje za uspešno končan vodič za nove uporabnike."
       hello:
         title: "Pozdravljeni!"
+        message: |-
+          Dobrodošli - zahvaljujemo se vam za pridružitev %{title}!
+
+          - Jaz sem samo robot ampak [naše osebje](%{base_uri}/about) je tudi na voljo, če potrebujete pomoč prave osebe.
+
+          - Iz varnostnih razlogov je omejeno kaj lahko novi uporabniki počnete. Ko vas bolje spoznamo, boste dobili [nove zmožnosti](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (in [značke](%{base_uri}/badges)).
+
+          - Verjamemo v [prijazno obnašanje v skupnosti](%{base_uri}/guidelines).
       onebox:
         instructions: |-
           Kot naslednji korak, ali lahko delite enega od spodnjih povezav z menoj? Odgovorite s **povezavo v svoji vrstici**, in se bo samodejno razširila tako, da bo vsebovala kratkek povzetek.
@@ -259,12 +265,6 @@ sl:
           _psst_ … V to temo sem skril presenečenje. Če ste pripravljeni sprejeti ta izziv, **izberite išči ikono** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> zgoraj desno &#8599; za iskanje.
 
           Poskusite poiskati "capy&#8203;bara" v tej temi.
-        hidden_message: |-
-          Kako ste spregledali capybara? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Ali ste opazili, da ste spet na začetku? Nahranite ubogega, lačnega capybara tako da **odgovorite z `:herb:` emoji** in to vas bo samodejno prestavilo na konec.
         reply: |-
           Super, našli ste ga :tada:
 
@@ -287,6 +287,7 @@ sl:
       certificate:
         alt: "Priznanje"
     advanced_user_narrative:
+      reset_trigger: "napredni vodič"
       cert_title: "Priznanje za uspešno končan vodič za napredne uporabnike."
       title: ":arrow_up: Napredne uporabniške funkcije"
       start_message: |-
@@ -326,6 +327,10 @@ sl:
           Ali mi naredite uslugo in **prekličete izbris**?
         not_found: |-
           Imate težavo? Uporabite prikaži več<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> da razkrijete akcijo <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> prekliči izbris.
+        reply: |-
+          Uf, to je bilo pa blizu! Hvala, da ste to rešili :wink:
+
+          Vedite, da imate samo ur%{deletion_after}ur za preklic izbrisa prispevka.
       category_hashtag:
         instructions: |-
           Ali ste vedeli, da se lahko navežete na kategorijo ali oznako v vašem prispevku? Na primer, ali ste videli %{category} kategorijo?
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sw.yml b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
index c530461a7f..3dc24a9c01 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sw.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
@@ -108,15 +108,6 @@ sw:
       random_mention:
         reply: |-
           Habari! kujua ninachoweza kufanya andika `@%{discobot_username}%{help_trigger}`.
-        bot_actions: |-
-          `@%{discobot_username}%{dice_trigger} 2d6`
-          > :game_die: 3 ,6
-
-          `@%{discobot_username}%{quote_trigger}`
-          > :left_speech_bubble:_Fanya vitendo vya huruma na upendo, bila kutegemea tuzo, ukijua kuwa siku moja mtu atakufanyia hivyo pia_&mdash; Princess Diana
-
-          `@%{discobot_username}%{magic_8_ball_trigger}`
-          >mpira_fuwele: Unaweza ukautegemea
       do_not_understand:
         first_response: |-
           Habari, asante kwa jibu lako!
@@ -246,12 +237,6 @@ sw:
           _psst_ ...Nimeficha kitu kwenye hii mada. Kama unapenda kujua, **chagua ikoni ya utafiti** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> upande wa juu mkono wako wa kulia &#8599; kukitafuta hicho kitu
 
           Jaribu kutafuta neno "capy&#8203;bara" kwenye hii mada
-        hidden_message: |-
-          Umepitwa vipi na capybara? :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          Umegundua umerudi ulipoanza? Shibisha capybara mwenye njaa kwa **kuandika `:herb` ishara** na utapelekwa mwisho.
         reply: |-
           Nina furaha kuwa umeiona :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.uk.yml b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
index aad10ef420..f126854198 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.uk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
@@ -6,20 +6,323 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 uk:
+  site_settings:
+    discourse_narrative_bot_enabled: "Увімкнути розмовний дискобот"
+    disable_discourse_narrative_bot_welcome_post: "Вимкнути вітальний пост від дискобота"
+    discourse_narrative_bot_ignored_usernames: "Імена користувачів, яких слід ігнорувати дискоботу"
+    discourse_narrative_bot_disable_public_replies: "Вимкнути публічні відповіді дискобота"
+    discourse_narrative_bot_welcome_post_type: "Тип привітального повідомлення, яке повинен надсилати дискобот"
+    discourse_narrative_bot_welcome_post_delay: "Зачекайте (n) секунд, перш ніж надсилати привітальне повідомлення дискоботом."
   badges:
     certified:
       name: Сертифікований
+      description: "Завершено наш підручник для новачків"
+      long_description: |
+        Цей знак надається після успішного завершення новачком інтерактивного навчального посібника. Ви спробували вивчити основні інструменти дискусії, і тепер ви сертифіковані!
+    licensed:
+      name: Ліцензований
+      description: "Завершено підручник для просунутих користувачів"
+      long_description: |
+        Цей знак надається після успішного завершення інтерактивного навчального посібника для просунутих користувачів. Ви освоїли передові інструменти обговорення – і тепер ви повністю ліцензовані!
   discourse_narrative_bot:
+    bio: "Привіт, я не справжня людина. Я бот, який може навчити вас роботі з цим сайтом. Щоб спілкуватися зі мною, надішліть мені повідомлення або згадайте ** `@ %{discobot_username}` ** де завгодно."
+    timeout:
+      message: |-
+        Привіт @%{username}, просто перевіряю, тому що я нічого не чув від вас давно.
+
+        - Щоб продовжити, будь-коли напишіть мені.
+
+        - Якщо ви хочете пропустити цей крок, скажіть `%{skip_trigger}`.
+
+        - Для початку, скажіть `%{reset_trigger}`.
+
+        Якщо ви не хочете, це теж добре. Я робот. Ви не зашкодите моїм почуттям. :sob:
     dice:
       trigger: "крутити"
+      invalid: |-
+        Вибачте, комбінація кубиків математично неможлива. :confounded:
     quote:
+      trigger: "цитата"
+      '1':
+        author: "Альберт Ейнштейн"
+      '3':
+        author: "Д-р Сеус"
+      '4':
+        quote: "Якщо ви хочете, щоб щось було зроблено правильно, зробіть це самостійно."
+      '5':
+        author: "Теодор Рузвельт"
+      '6':
+        author: "Мама Фореста Гампа"
+      '7':
+        quote: "Це один невеликий крок для людини, гігантський стрибок для людства."
+        author: "Ніл Армстронг"
+      '8':
+        quote: "Щодня робіть щось одне, що вас лякає."
+        author: "Елеонора Рузвельт"
       '9':
         author: "Брюс Лі"
+      '10':
+        author: "Гора Наполеона"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: "фортуна"
       answers:
+        '1': "Це певно"
+        '2': "Це точно так"
+        '3': "Без сумніву"
+        '4': "так, звичайно"
+        '5': "Ви можете покластися на це"
+        '6': "Як я бачу, так"
+        '7': "Ймовірно"
+        '8': "Прогноз хороший"
         '9': "Так"
+        '10': "Знаки підказують що так"
+        '11': "Відповідь туманна, спробуйте ще раз"
+        '12': "Запитайте знову пізніше"
+        '13': "Краще зараз не скажу"
+        '14': "Неможливо передбачити зараз"
+        '15': "Зосередьтеся і запитайте знову"
+        '16': "Не розраховуйте на це"
         '17': "Моя відповідь - ні"
+        '18': "Мої джерела кажуть, що ні"
+        '19': "Прогноз не такий хороший"
+        '20': "Дуже сумнівно"
+      result: |-
+        &gt; :crystal_ball: %{result}
     track_selector:
       reset_trigger: "розпочати"
       skip_trigger: "пропустити"
       help_trigger: "показати допомогу"
+      random_mention:
+        reply: |-
+          Привіт! Щоб дізнатися, що я можу зробити, скажіть `@ %{discobot_username} %{help_trigger}`.
+        tracks: |-
+          На даний момент я знаю, як робити наступні речі: `@ %{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          &gt; Запускає інтерактивний підручник. `{name-of-tutorial}` може бути одним із: `%{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: Ви можете на це розраховувати
+      do_not_understand:
+        first_response: |-
+          Дякую за відповідь! На жаль, як погано запрограмований бот, я не можу повністю зрозуміти цього. :frowning:
+        track_response: Ви можете спробувати ще раз, або якщо ви хочете пропустити цей крок, скажіть `%{skip_trigger}`. Інакше для початку скажіть `%{reset_trigger}`.
+        second_response: |-
+          Ой, вибачте. Я досі не розумію цього. :anguished:
+
+          Я просто бот, але якщо ви хочете знайти реальну людину, перегляньте [our contact page](%{base_path}/about).
+
+          Тим часом я залишатимусь подалі.
+    new_user_narrative:
+      reset_trigger: "навчальний посібник"
+      title: "Новий сертифікат користувачу про завершення посібника"
+      cert_title: "На знак успішного завершення посібника новачка"
+      hello:
+        title: "Вітаємо!"
+        message: |-
+          Дякуємо за приєднання до %{title}, і ласкаво просимо!
+
+          - Я лише робот, але [наш доброзичливий персонал] (%{base_uri}/about) також тут, щоб допомогти, якщо вам потрібно зв’язатися з людиною.
+
+          - З міркувань безпеки ми тимчасово обмежуємо те, що можуть робити нові користувачі. Ви отримаєте [нові здібності] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (та [нагороди] (%{base_uri}/badges)), як ми познайомимося з вами.
+
+          - Ми віримо в [цивілізовану поведінку спільноти] (%{base_uri}/guidelines) в усі часи.
+      onebox:
+        instructions: |-
+          Далі, можете поділитися одним із цих посилань зі мною? Відповідайте за допомогою **посилання на рядок самостійно**, і воно автоматично розшириться, щоб включити чудовий підсумок.
+
+          Щоб скопіювати будь-яке посилання, натисніть і утримуйте на мобільному пристрої, або клацніть правою кнопкою миші на посилання:
+
+          <https://en.wikipedia.org/wiki/Inherently_funny_word>
+          <https://en.wikipedia.org/wiki/Death_by_coconut>
+          <https://en.wikipedia.org/wiki/Calculator_spelling>
+        reply: |-
+          Класно! Це працюватиме для більшості <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> посилань. Пам'ятайте, що воно повинно бути на лінії _all by itself_, без нічого іншого спереду чи ззаду.
+        not_found: |-
+          Вибачте, я не зміг знайти посилання у вашій відповіді! :cry:
+
+          Чи можете ви спробувати додати це посилання у окремому рядку до наступної своєї відповіді?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          Ось малюнок єдинорога:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Якщо вам це подобається (а навіть може й ні!), продовжуйте і натискайте схоже :heart: кнопку під цією публікацією, щоб повідомити мені.
+
+          Чи можете ви **відповісти із зображенням?** Будь-яка картинка підійде! Перетягніть, натисніть кнопку завантаження або просто скопіюйте та вставте її.
+        reply: |-
+          Вишуканий малюнок - я натиснув на кнопку :heart:, щоб повідомити, наскільки я ціную це :heart_eyes:
+        like_not_found: |-
+          Ви забули вподобати :heart: мій [допис?](%{url}) :crying_cat_face:
+        not_found: |-
+          Схоже, ви не завантажили зображення, тому я вибрав зображення, яке впевнений вам сподобається.
+
+          `%{image_url}`
+
+          Спробуйте його завантажити, або вставити посилання в окремий рядок!
+      quoting:
+        reply: |-
+          Чудова робота, ти вибрав мою улюблену цитату! : left_speech_bubble:
+      bookmark:
+        not_found: |-
+          Ах, я не бачу жодної закладки в цій темі. Ви знаходили закладку під кожною публікацією? Використовуйте показати більше <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> щоб виявити додаткові дії, якщо це потрібно.
+      search:
+        hidden_message: |-
+          Як ви скучили за цею capybara?  :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Ви помітили, що ви зараз на початку? Нагодуйте цього бідного голодного capybara, **відповідаючи на емоції `%{search_answer}` emoji**, і вас автоматично проведуть до кінця.
+        reply: |-
+          Так, ви знайшли: tada:
+
+          - Для більш детальних пошуків перейдіть до [повної сторінки пошуку] (%{search_url}).
+
+          - Щоб перейти з будь-якого місця в тривалу дискусію, спробуйте елементи керування тимчасовою шкалою праворуч (і знизу, на мобільному пристрої).
+
+          - Якщо у вас є фізична :keyboard:, натисніть <kbd>?</kbd> щоб переглянути наші зручні комбінації клавіш.
+        not_found: |-
+          Гм ... схоже, у вас можуть виникнути проблеми. Вибачте за це. Ви шукали <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> термін **capy&#8203;bara**?
+      end:
+        message: |-
+          Дякуємо, що тримаєтесь зі мною @%{username}! Я зробив це для вас, я думаю, ви це заробили:
+
+          %{certificate}
+
+          Це все зараз! Перегляньте [**наші останні теми дискусій**] (/latest) %{base_uri}або [**категорії обговорень**] (%{base_uri}/categories). :sunglasses:
+
+          (Якщо ви хочете знову поговорити зі мною, щоб дізнатися більше, просто напишіть або згадайте `@%{discobot_username}` будь-коли!)
+      certificate:
+        alt: "Свідоцтво про досягнення"
+    advanced_user_narrative:
+      reset_trigger: "розширений підручник"
+      cert_title: "На знак успішного завершення посібника для досвідчених користувачів"
+      title: ":arrow_up: Розширені функції користувача"
+      start_message: |-
+        Як _advanced_ user_, ви відвідали [сторінку своїх уподобань] (%{base_uri}/my/preferences) ще @%{username}? Існує маса способів налаштувати свій досвід, наприклад, вибрати темну або світлу тему.
+
+        Але я відволікаюсь, почнемо!
+      edit:
+        bot_created_post_raw: "@ %{discobot_username} - це, безумовно, найкрутіший бот, якого я знаю :wink:"
+        instructions: |-
+          Усі роблять помилки. Але не хвилюйтеся, ви завжди можете редагувати свої публікації, щоб виправити їх! Чи можете ви почати з **редагування** допису, який я щойно створив від вашого імені?
+        not_found: |-
+          Схоже, ви ще не редагували [post] (%{url}), який я створив для вас. Можете спробувати ще раз? Використовуйте <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> для цього іконку редактора.
+        reply: |-
+          Чудова робота!
+
+          Зауважте, що зміни, зроблені через 5 хвилин, відображатимуться як публічні редагування, а вгорі праворуч з’явиться невеликий значок олівця з кількістю редакцій.
+      delete:
+        instructions: |-
+          Якщо ви хочете зняти створену вами публікацію, можете її видалити.
+
+          Вперед і **видаліть** будь-яку з ваших публікацій вище, використовуючи <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **видалити** дію. Однак не видаляйте першу публікацію!
+        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-trash.png" width="16" height="16"> видалити.
+        reply: |-
+          Ого! :boom:
+
+          Щоб зберегти безперервність обговорень, видалення не є негайним, а тому повідомлення буде видалено через деякий час.
+      recover:
+        deleted_post_raw: "Чому @%{discobot_username} видалив мою публікацію? :anguished:"
+        instructions: |-
+          О ні! Схоже, я випадково видалив нову публікацію, яку я щойно створив для вас.
+
+          Чи можете ви зробити мені послугу і <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **відновити** це?
+        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-rotate-left.png" width="16" height="16"> відновити.
+        reply: |-
+          Фух, це було близько! Дякую за виправлення цього :wink:
+
+          Зауважте, що у вас є лише %{deletion_after} годин, щоб відновити публікацію.
+      category_hashtag:
+        instructions: |-
+          Чи знаєте ви, що ви можете посилатися на категорії та теги у своєму дописі? Наприклад, ви бачили категорію %{category}?
+
+          Введіть `#` у середині речення та виберіть будь-яку категорію чи тег.
+        not_found: |-
+          Гм, я ніде не бачу категорії. Зауважте, що `#` не може бути першим символом. Чи можете ви скопіювати це у своїй наступній відповіді?
+
+          ```текст
+          Я можу створити посилання на категорію через #
+          ```
+        reply: |-
+          Відмінно! Пам’ятайте, що це працює для обох категорії _та_ теги, якщо теги включені.
+      change_topic_notification_level:
+        instructions: |-
+          Кожна тема має рівень сповіщень. Це починається з 'нормального', що означає, що вас зазвичай повідомлять лише тоді, коли хтось безпосередньо звертається до вас.
+
+          За замовчуванням рівень сповіщення для приватного повідомлення встановлюється на найвищому рівні 'слідкувати', а значить, вам буде повідомлено про кожну нову відповідь. Але ви можете змінити рівень сповіщення для теми _any_ на  'споглядати', 'слідкувати' або 'вимкнено'.
+
+          Спробуємо змінити рівень сповіщення для цієї теми. Внизу теми ви знайдете кнопку, яка показує, що ви **переглядаєте** цю тему. Чи можете ви змінити рівень сповіщення на **слідкувати**?
+        not_found: |-
+          Схоже, ви все ще дивитеся :eyes: на цю тему! Якщо у вас виникли проблеми з її пошуком, кнопка рівня сповіщень розташована внизу теми.
+        reply: |-
+          Дивовижна робота! Я сподіваюся, що ви не заглушили цю тему, оскільки я часом можу бути трохи балакучим :grin:.
+
+          Зауважте, що коли ви відповідаєте на тему чи читаєте тему більше декількох хвилин, вона автоматично встановлюється на рівень сповіщень 'відстеження'. Ви можете змінити це в [налаштуваннях](%{base_uri}/my/preferences).
+      poll:
+        instructions: |-
+          Чи знаєте ви, що можете додати опитування до будь-якої публікації? Спробуйте скористатися <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> шестерня в редакторі **побудувати опитування**.
+        not_found: |-
+          Ой! У вашій відповіді не було жодного опитування. Використовуйте <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> значок шестерні у редакторі, або скопіюйте та вставте це опитування у своїй наступній відповіді:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Вітаю, приємне опитування! Як я можу навчити вас?
+
+          [poll]
+
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Іноді ви можете захотіти **приховати деталі ** у своїх відповідях:
+
+          - Коли ви обговорюєте сюжетні моменти фільму чи телешоу, які вважатимуться спойлером.
+
+          - Коли ваша публікація потребує безлічі необов’язкових деталей, які можуть бути непосильними, коли прочитаєте їх відразу
+
+          [details=Виберіть це, щоб побачити, як це працює!]
+          1. Виберіть <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> передати в редактор.
+          2. Виберіть "Приховати деталі".
+          3. Відредагуйте резюме деталей та додайте свій вміст.
+          [/details]
+
+          Чи можете ви використовувати це <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> в редакторі, щоб додати розділ деталей до наступної відповіді?
+        not_found: |-
+          Виникли проблеми зі створенням віджета з деталями? Спробуйте включити наступне у свою наступну відповідь:
+
+          ```text
+          [details=Виберіть мене для деталей]
+          Ось тут деталі
+          [/details]
+          ```
+        reply: |-
+          Чудова робота – ваша увага до _деталей_ захоплююча!
+      end:
+        message: |-
+          Ви пройшли через це, як _досконалий користувач_ дійсно :bow:
+
+          %{certificate}
+
+          Це все, що я маю для вас.
+
+          До побачення! Якщо ви схочете знову поговорити зі мною, будь-коли надішліть мені повідомлення :sunglasses:
+      certificate:
+        alt: "Сертифікат про досягнення просунутого користувача"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index a9a6fa1adb..9f439dec0b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -118,15 +118,6 @@ ur:
 
           `@%{discobot_username} %{reset_trigger} {ٹیوٹوریل-کا-نام}`
           > ایک انٹرایکٹو ٹیوٹوریل شروع کر دیتا ہے۔ {ٹیوٹوریل-کا-نام} اِن میں سے ایک ہوسکتا ہے: `%{tracks}`۔
-        bot_actions: |-
-          `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3، 6
-
-          `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _رحم کا ایک بلا سوچِ سمجھے عمل کریں، بغیر کسی انعام کی توقع کے ساتھ، یہ جان کر کہ ایک دن کوئی دوسرا بھی آپ کیلئے ویسا ہی کر سکتا ہے_ &mdash; شہزادی ڈیانا
-
-          `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: آپ اس پر انحصار کر سکتے ہیں
       do_not_understand:
         first_response: |-
           ارے، جواب کیلئے شکریہ!
@@ -273,12 +264,6 @@ ur:
           _ارے_ ... میں نے اس ٹاپک میں سَرپرائیز چھپایا ہے۔ اگر آپ چیلنج کیلۓ تیار ہیں، تو اس کو تلاش کرنے کیلۓ اوپر دائیں جانب &#8599; ** سرچ کے آئکن کو سَلَیکٹ کریں** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">۔
 
           اِس ٹاپک میں "کَیپی&#8203;بارا" اصطلاح سرچ کرنے کی کوشش کریں
-        hidden_message: |-
-          آپ نے یہ کَیپیبارا کیسے مِس کر دیا؟ :wink:
-
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
-
-          کیا آپ نے نوٹ کیا کہ اب آپ واپس شروع پر پہنچ گئے ہیں؟ اِس بیچارے بھوکے کَیپیبارا کو **`:herb:` اِیمَوجی سے جواب دے کر** کھانا کھلائیں اور آپ کو خود بخود آخر میں لے جایا جائے گا۔
         reply: |-
           شاباش آپ نے اسے ڈھونڈ لیا :tada:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.vi.yml b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
index 54fef246a8..5c7e3d659c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.vi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
@@ -19,6 +19,33 @@ vi:
       name: Đã cấp phép
       description: "Đã hoàn thành hướng dẫn nâng cao cho thành viên mới của chúng tôi"
   discourse_narrative_bot:
+    quote:
+      '3':
+        quote: "Đừng khóc vì nó đã qua, hãy cười vì điều đó đã xảy ra."
+      '4':
+        quote: "Nếu bạn muốn một cái gì đó được thực hiện đúng theo ý bạn, hãy tự làm nó."
+      '5':
+        quote: "Hãy tin rằng bạn có thể và bạn đã làm được một nửa."
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
       answers:
+        '2': "Nó được quyết định như vậy"
         '9': "Đồng ý"
+        '11': "Trả lời không rõ ràng, hãy thử lại"
+        '15': "Tập trung và hỏi lại lần nữa"
+        '20': "Rất đáng ngờ"
+    new_user_narrative:
+      images:
+        reply: |-
+          Hình ảnh tiện lợi - Tôi nhấn nút like :heart: để cho bạn biết tôi đánh giá cao nó như thế nào :heart_eyes:
+      bookmark:
+        instructions: |-
+          Nếu bạn muốn tìm hiểu thêm, hãy chọn nút <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> bên dưới và chọn <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> để **đánh dấu tin nhắn cá nhân này**. Nếu bạn làm như vậy, bạn có thể có một :gift: trong tương lai!
+      certificate:
+        alt: "Giấy chứng nhận thành tích"
+    advanced_user_narrative:
+      title: ":arrow_up: Người dùng nâng cao"
+      category_hashtag:
+        reply: |-
+          Xuất sắc! Hãy nhớ điều này hoạt động cho cả hai loại danh mục và  thẻ, nếu thẻ được bật.
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 0681d11e92..c86df2dc4a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -120,10 +120,10 @@ zh_CN:
           > 开始交互式教程。`{name-of-tutorial}`可以是一个：`%{tracks}`。
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3，6
+          > :game_die: 3, 6
 
           `@%{discobot_username} %{quote_trigger}`
-          > :left_speech_bubble: _随手做些善举，不要期待任何的回报，肯定能懂得一个道理：总有一天有人会为你做同样的事情。_ &mdash; 戴安娜公主
+          %{quote_sample}
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: 你可能需要它
@@ -279,7 +279,7 @@ zh_CN:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          注意到你回到主题开头了么？**带 `:herb:` 这个 emoji 回复** 来喂养这只可怜又饥饿的 capabara，你会自动跳转到结尾。
+          注意到你回到主题开头了么？**带 `%{search_answer}` 这个 emoji 回复** 来喂养这只可怜又饥饿的 capabara，你会自动跳转到结尾。
         reply: |-
           你找到啦 :tada:
 
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml b/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
index 3acfff74e8..4e6ab0d32f 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  site_settings:
+    daily_performance_report: "Щодня аналізуйте журнали NGINX та публікуйте тему лише для персоналу з деталями"
diff --git a/plugins/discourse-presence/config/locales/client.ja.yml b/plugins/discourse-presence/config/locales/client.ja.yml
index cf06c8e786..0ba70b95b6 100644
--- a/plugins/discourse-presence/config/locales/client.ja.yml
+++ b/plugins/discourse-presence/config/locales/client.ja.yml
@@ -9,5 +9,6 @@ ja:
   js:
     presence:
       replying: "返信中"
+      editing: "編集中"
       replying_to_topic:
         other: "返信中"
diff --git a/plugins/discourse-presence/config/locales/client.uk.yml b/plugins/discourse-presence/config/locales/client.uk.yml
index 3acfff74e8..8c7404163b 100644
--- a/plugins/discourse-presence/config/locales/client.uk.yml
+++ b/plugins/discourse-presence/config/locales/client.uk.yml
@@ -5,4 +5,13 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  js:
+    presence:
+      replying: "відповідаючи"
+      editing: "редагуючи"
+      replying_to_topic:
+        one: "відповідаючи"
+        few: "відповідаючи"
+        many: "відповідаючи"
+        other: "відповідаючи"
diff --git a/plugins/discourse-presence/config/locales/server.en.yml b/plugins/discourse-presence/config/locales/server.en.yml
index 1de132d696..2ca43bd203 100644
--- a/plugins/discourse-presence/config/locales/server.en.yml
+++ b/plugins/discourse-presence/config/locales/server.en.yml
@@ -1,4 +1,4 @@
 en:
   site_settings:
-    presence_enabled: 'Show users that are currently replying to the current topic, or editing the current post?'
-    presence_max_users_shown: 'Maximum number of users shown.'
+    presence_enabled: "Show users that are currently replying to the current topic, or editing the current post?"
+    presence_max_users_shown: "Maximum number of users shown."
diff --git a/plugins/discourse-presence/config/locales/server.uk.yml b/plugins/discourse-presence/config/locales/server.uk.yml
index 3acfff74e8..565efc5398 100644
--- a/plugins/discourse-presence/config/locales/server.uk.yml
+++ b/plugins/discourse-presence/config/locales/server.uk.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  site_settings:
+    presence_enabled: 'Показати користувачів, які зараз відповідають на поточну тему чи редагують поточну публікацію?'
+    presence_max_users_shown: 'Максимальна кількість показаних користувачів.'
diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml
index 3acb4d99b9..6addef6c35 100644
--- a/plugins/poll/config/locales/client.uk.yml
+++ b/plugins/poll/config/locales/client.uk.yml
@@ -8,12 +8,26 @@
 uk:
   js:
     poll:
+      voters:
+        one: "виборця"
+        few: "виборців"
+        many: "виборців"
+        other: "проголосували"
       total_votes:
         one: "голос"
         few: "голосів"
         many: "голоси"
         other: "голоси"
       average_rating: "Середній рейтинг: <strong>%{average}</strong>."
+      public:
+        title: "Голоси <strong>публічні</strong> ."
+      results:
+        vote:
+          title: "Результати будуть показані при <strong>голосуванні</strong> ."
+        closed:
+          title: "Результати будуть показані після <strong>закриття</strong> ."
+        staff:
+          title: "Результати показуються лише <strong>співробітникам</strong> ."
       multiple:
         help:
           at_least_min_options:
@@ -21,22 +35,65 @@ uk:
             few: "Виберіть хоча б <strong>%{count}</strong> варіантів"
             many: "Виберіть хоча б <strong>%{count}</strong> варіанти"
             other: "Виберіть хоча б <strong>%{count}</strong> варіанти"
+          up_to_max_options:
+            one: "Виберіть варіант <strong>%{count}</strong>"
+            few: "Виберіть до <strong>%{count}</strong> варіантів"
+            many: "Виберіть до <strong>%{count}</strong> варіантів"
+            other: "Виберіть до <strong>%{count}</strong> варіантів"
+          x_options:
+            one: "Виберіть варіант <strong>%{count}</strong>"
+            few: "Виберіть параметри <strong>%{count}</strong>"
+            many: "Виберіть параметри <strong>%{count}</strong>"
+            other: "Виберіть параметри <strong>%{count}</strong>"
+          between_min_and_max_options: "Виберіть параметри від<strong>%{min}</strong> до %{max}</strong>"
       cast-votes:
+        title: "Проголосуйте"
         label: "Проголосувати!"
       show-results:
+        title: "Показати результати опитування"
         label: "Показати результати"
       hide-results:
+        title: "Назад до своїх голосів"
         label: "Приховати результати"
       open:
+        title: "Відкрити опитування"
         label: "Відкрити"
+        confirm: "Ви впевнені, що хочете відкрити це опитування?"
       close:
+        title: "Закрити опитування"
         label: "Закрити"
+        confirm: "Ви впевнені, що хочете закрити це опитування?"
+      automatic_close:
+        closes_in: "Закривається в <strong>%{timeLeft}</strong> ."
+        age: "Закрито <strong>%{age}</strong>"
+      error_while_toggling_status: "На жаль, виникла помилка зміни статусу цього опитування."
+      error_while_casting_votes: "На жаль, сталася помилка під час голосування."
+      error_while_fetching_voters: "На жаль, під час відображення тих, хто проголосував, сталася помилка."
       ui_builder:
+        title: Створити опитування
+        insert: Вставити опитування
+        help:
+          options_count: Введіть принаймні 2 варіанти
+          invalid_values: Мінімальне значення має бути меншим, ніж максимальне.
+          min_step_value: Мінімальне значення кроку 1
         poll_type:
           label: Тип
+          regular: Єдиний вибір
+          multiple: Широкий вибір
+          number: Рейтинг в цифрах
         poll_result:
           label: Результати
+          always: Завжди видно
+          vote: На голосування
+          closed: Коли закрито
+          staff: Для персоналу тільки
         poll_config:
           max: Макс
           min: Мін
           step: Крок
+        poll_public:
+          label: Покажіть, хто проголосував
+        poll_options:
+          label: Введіть один варіант опитування на рядок
+        automatic_close:
+          label: Автоматично закрити опитування
diff --git a/plugins/poll/config/locales/client.vi.yml b/plugins/poll/config/locales/client.vi.yml
index 624e9e3e38..0028c9567f 100644
--- a/plugins/poll/config/locales/client.vi.yml
+++ b/plugins/poll/config/locales/client.vi.yml
@@ -13,6 +13,8 @@ vi:
       total_votes:
         other: "tổng số bình chọn"
       average_rating: "Trung bình: <strong>%{average}</strong>."
+      public:
+        title: "Bình chọn <strong>công khai</strong>"
       multiple:
         help:
           at_least_min_options:
diff --git a/plugins/poll/config/locales/server.fi.yml b/plugins/poll/config/locales/server.fi.yml
index e6cdaacfa8..aa9eb899d8 100644
--- a/plugins/poll/config/locales/server.fi.yml
+++ b/plugins/poll/config/locales/server.fi.yml
@@ -7,7 +7,7 @@
 
 fi:
   site_settings:
-    poll_enabled: "Salli äänestykset?"
+    poll_enabled: "Sallitaanko äänestykset?"
     poll_maximum_options: "Äänestysvaihtoehtojen suurin sallittu määrä."
     poll_edit_window_mins: "Kuinka monta minuuttia on aikaa muokata äänestystä sen luomisen jälkeen."
     poll_minimum_trust_level_to_create: "Vähimmäisluottamustaso, jolla voi luoda äänestyksiä."
diff --git a/plugins/poll/config/locales/server.uk.yml b/plugins/poll/config/locales/server.uk.yml
index 37b409336c..c3036ca676 100644
--- a/plugins/poll/config/locales/server.uk.yml
+++ b/plugins/poll/config/locales/server.uk.yml
@@ -7,15 +7,42 @@
 
 uk:
   site_settings:
+    poll_enabled: "Дозволити опитування?"
     poll_maximum_options: "Максимальна кількість варіантів в опитуванні"
+    poll_edit_window_mins: "Кількість хвилин після створення публікації, протягом якої опитування можна редагувати."
+    poll_minimum_trust_level_to_create: "Визначте мінімальний рівень довіри, необхідний для створення опитувань."
   poll:
+    poll: "опитування"
+    invalid_argument: "Неправильне значення '%{value}' для аргументу '%{argument}'."
+    multiple_polls_without_name: "Існує кілька опитувань без імені. Використовуйте атрибут '<code>name</code>', щоб однозначно визначити свої опитування."
+    multiple_polls_with_same_name: "Існує кілька опитувань з однаковою назвою: <strong>%{name}</strong> . Використовуйте атрибут '<code>name</code>', щоб однозначно визначити свої опитування."
     default_poll_must_have_at_least_2_options: "Голосування повинно мати щонайменше 2 варіанти."
     named_poll_must_have_at_least_2_options: "Голосування під назвою <strong>%{name}</strong> повинно мати щонайменше 2 варіанти."
-    default_poll_must_have_different_options: "Голосування повинно мати різні варіанти."
+    default_poll_must_have_less_options:
+      one: "Опитування повинно мати менше опції %{count}."
+      few: "Опитування повинно мати менше варіантів %{count}."
+      many: "Опитування повинно мати менше варіантів %{count}."
+      other: "Опитування повинно мати менше %{count} варіантів."
+    named_poll_must_have_less_options:
+      one: "Опитування з назвою <strong>%{name}</strong> повинно мати менше, ніж опції %{count}."
+      few: "Опитування з назвою <strong>%{name}</strong> повинно мати менше варіантів %{count}."
+      many: "Опитування з назвою <strong>%{name}</strong> повинно мати менше варіантів %{count}."
+      other: "Опитування з назвою <strong>%{name}</strong> повинно мати менше %{count} варіантів."
+    default_poll_must_have_different_options: "Опитування повинно мати різні варіанти."
     named_poll_must_have_different_options: "Голосування під назвою <strong>%{name}</strong> повинно мати різні варіанти."
+    default_poll_with_multiple_choices_has_invalid_parameters: "Опитування з кількома варіантами має недійсні параметри."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Опитування з назвою <strong>%{name}</strong> з множинним вибором має недійсні параметри."
     requires_at_least_1_valid_option: "Ви маєте обрати щонайменше 1 валідний варіант."
+    edit_window_expired:
+      cannot_edit_default_poll_with_votes: "Ви не можете змінити опитування після перших %{minutes} хвилин."
+      cannot_edit_named_poll_with_votes: "Ви не можете змінити назву опитування <strong>${name}</strong> після перших %{minutes} хвилин."
     no_poll_with_this_name: "Для цього допису відсутнє голосування під назвою <strong>%{name}</strong>."
+    post_is_deleted: "Немає дій над видаленою публікацією."
+    user_cant_post_in_topic: "Ви не можете голосувати, тому що ви не можете писати в цій темі."
     topic_must_be_open_to_vote: "Тема має бути відкрита для голосування."
     poll_must_be_open_to_vote: "Опитування має бути відкритим для голосування."
+    topic_must_be_open_to_toggle_status: "Тема повинна бути відкритою для зміни статусу."
+    only_staff_or_op_can_toggle_status: "Тільки співробітник або автор можуть змінити статус опитування."
+    insufficient_rights_to_create: "Вам не дозволено створювати опитування."
     email:
       link_to_poll: "Натисніть, щоб подивитися опитування."
diff --git a/public/403.ja.html b/public/403.ja.html
index 93c1577e00..7918e84407 100644
--- a/public/403.ja.html
+++ b/public/403.ja.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>許可されていません (403)</title>
+<title>この操作は許可されていません (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -19,7 +19,7 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>閲覧することができません。</p>
+    <p>この情報は閲覧することができません。</p>
 
     <p>Discourse の 403 ページに置き換えられます。</p>
   </div>
diff --git a/public/500.da.html b/public/500.da.html
index f272d4d890..e4fd6bb4fb 100644
--- a/public/500.da.html
+++ b/public/500.da.html
@@ -8,6 +8,6 @@
     <h1>Hovsa</h1>
     <p>Der skete en uventet fejl i den software der styrer dette diskussions forum. Vi undskylder for beværet.</p>
     <p>Detaljerede informationer om fejlen er blevet logget og en automatisk besked er sendt til ejerne. Vi kigger på det.</p>
-    <p>Du behøver ikke gøre mere. Men hvis fejlet bliver ved med at opstå, kan du give yderligere detaljer til at reproducere fejlen ved at lave et indlæg i feedback kategorien.</p>
+    <p>Du behøver ikke gøre mere. Men hvis fejlen bliver ved med at opstå, kan du give yderligere detaljer til at reproducere fejlen, ved at lave et Diskussionsemne i kategori 'feedback'.</p>
 </body>
 </html>

From 014f19b6ea5279f4cb236af70d217b933fd31f1c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 5 Nov 2019 10:37:32 -0600
Subject: [PATCH 316/328] DEV: Import Promise from rsvp (#8296)

---
 .../admin/mixins/penalty-controller.js.es6    |  3 +-
 .../admin/mixins/setting-component.js.es6     |  3 +-
 .../admin/models/admin-user.js.es6            |  3 +-
 .../admin/services/admin-tools.js.es6         |  7 +++--
 app/assets/javascripts/discourse-loader.js    |  6 ++++
 .../discourse/components/d-editor.js.es6      |  3 +-
 .../discourse/controllers/composer.js.es6     |  9 +++---
 .../discourse/controllers/grant-badge.js.es6  |  3 +-
 .../discourse/controllers/topic.js.es6        |  5 ++--
 .../javascripts/discourse/lib/ajax.js.es6     |  5 ++--
 .../discourse/lib/category-tag-search.js.es6  |  3 +-
 .../discourse/lib/click-track.js.es6          |  3 +-
 .../lib/desktop-notifications.js.es6          |  7 +++--
 .../discourse/lib/load-script.js.es6          |  8 +++--
 .../discourse/lib/pwa-utils.js.es6            |  4 ++-
 .../javascripts/discourse/lib/text.js.es6     |  3 +-
 .../discourse/lib/user-search.js.es6          |  3 +-
 .../javascripts/discourse/models/badge.js.es6 |  3 +-
 .../discourse/models/composer.js.es6          |  5 ++--
 .../discourse/models/invite.js.es6            |  5 ++--
 .../discourse/models/login-method.js.es6      |  5 ++--
 .../discourse/models/post-stream.js.es6       | 29 ++++++++++---------
 .../javascripts/discourse/models/post.js.es6  |  3 +-
 .../javascripts/discourse/models/rest.js.es6  |  5 ++--
 .../discourse/models/result-set.js.es6        |  3 +-
 .../discourse/models/reviewable.js.es6        |  3 +-
 .../discourse/models/static-page.js.es6       |  2 +-
 .../javascripts/discourse/models/store.js.es6 |  2 +-
 .../discourse/models/topic-list.js.es6        |  5 ++--
 .../javascripts/discourse/models/topic.js.es6 |  4 +--
 .../discourse/models/user-badge.js.es6        |  3 +-
 .../models/user-drafts-stream.js.es6          |  6 ++--
 .../discourse/models/user-posts-stream.js.es6 |  5 ++--
 .../discourse/models/user-stream.js.es6       |  5 ++--
 .../javascripts/discourse/models/user.js.es6  |  5 ++--
 .../discourse/routes/badges-show.js.es6       |  3 +-
 .../routes/build-category-route.js.es6        |  5 ++--
 .../discourse/routes/build-topic-route.js.es6 |  2 +-
 .../routes/discovery-categories.js.es6        |  7 +++--
 .../discourse/widgets/post-menu.js.es6        |  5 ++--
 .../javascripts/discourse/widgets/post.js.es6 |  4 +--
 .../widgets/quick-access-panel.js.es6         |  4 +--
 .../widgets/quick-access-profile.js.es6       |  2 +-
 .../discourse/widgets/widget.js.es6           |  5 ++--
 44 files changed, 128 insertions(+), 85 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index 7be1ab97b2..cb07e9d2ca 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 { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
   reason: null,
@@ -26,7 +27,7 @@ export default Mixin.create(ModalFunctionality, {
 
   penalize(cb) {
     let before = this.before;
-    let promise = before ? before() : Ember.RSVP.resolve();
+    let promise = before ? before() : Promise.resolve();
 
     return promise
       .then(() => cb())
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index a8040a63ca..762d5cfa2b 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -5,6 +5,7 @@ import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
 import showModal from "discourse/lib/show-modal";
 import AboutRoute from "discourse/routes/about";
+import { Promise } from "rsvp";
 
 const CUSTOM_TYPES = [
   "bool",
@@ -112,7 +113,7 @@ export default Mixin.create({
     Ember.warn("You should define a `_save` method", {
       id: "discourse.setting-component.missing-save"
     });
-    return Ember.RSVP.resolve();
+    return Promise.resolve();
   },
 
   actions: {
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index e99c84e0b4..880cb44c39 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -6,6 +6,7 @@ import { propertyNotEqual } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
 import { userPath } from "discourse/lib/url";
+import { Promise } from "rsvp";
 
 const wrapAdmin = user => (user ? AdminUser.create(user) : null);
 
@@ -503,7 +504,7 @@ const AdminUser = Discourse.User.extend({
 
   loadDetails() {
     if (this.loadedDetails) {
-      return Ember.RSVP.resolve(this);
+      return Promise.resolve(this);
     }
 
     return AdminUser.find(this.id).then(result => {
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
index 38aa9e452d..bb5e1ac06a 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js.es6
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -9,6 +9,7 @@ import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Service from "@ember/service";
+import { Promise } from "rsvp";
 
 export default Service.extend({
   init() {
@@ -54,7 +55,7 @@ export default Service.extend({
     controller.setProperties({ postId: opts.postId, postEdit: opts.postEdit });
 
     return (user.adminUserView
-      ? Ember.RSVP.resolve(user)
+      ? Promise.resolve(user)
       : AdminUser.find(user.get("id"))
     ).then(loadedUser => {
       controller.setProperties({
@@ -78,7 +79,7 @@ export default Service.extend({
     // Try loading the email if the site supports it
     let tryEmail = this.siteSettings.moderators_view_emails
       ? adminUser.checkEmail()
-      : Ember.RSVP.resolve();
+      : Promise.resolve();
 
     return tryEmail.then(() => {
       let message = I18n.messageFormat("flagging.delete_confirm_MF", {
@@ -92,7 +93,7 @@ export default Service.extend({
 
       let userId = adminUser.get("id");
 
-      return new Ember.RSVP.Promise((resolve, reject) => {
+      return new Promise((resolve, reject) => {
         const buttons = [
           {
             label: I18n.t("composer.cancel"),
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index d6f2171dd7..21034aa75a 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -73,7 +73,13 @@ var define, requirejs;
       },
       "@ember/utils": {
         isEmpty: Ember.isEmpty
+      },
+      "rsvp": {
+        Promise: Ember.RSVP.Promise,
+        hash: Ember.RSVP.hash,
+        all: Ember.RSVP.all
       }
+
     };
   }
 
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index e839fad6c6..3d926b9783 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -29,6 +29,7 @@ import { translations } from "pretty-text/emoji/data";
 import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
 import { emojiUrlFor } from "discourse/lib/text";
 import showModal from "discourse/lib/show-modal";
+import { Promise } from "rsvp";
 
 // Our head can be a static string or a function that returns a string
 // based on input (like for numbered lists).
@@ -453,7 +454,7 @@ export default Component.extend({
       },
 
       dataSource: term => {
-        return new Ember.RSVP.Promise(resolve => {
+        return new Promise(resolve => {
           const full = `:${term}`;
           term = term.toLowerCase();
 
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 195df3baad..df26812280 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -24,6 +24,7 @@ import {
 import { emojiUnescape } from "discourse/lib/text";
 import { shortDate } from "discourse/lib/formatter";
 import { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
+import { Promise } from "rsvp";
 
 function loadDraft(store, opts) {
   opts = opts || {};
@@ -801,7 +802,7 @@ export default Controller.extend({
       composerModel = null;
     }
 
-    return new Ember.RSVP.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       if (composerModel && composerModel.replyDirty) {
         // If we're already open, we don't have to do anything
         if (
@@ -945,7 +946,7 @@ export default Controller.extend({
         this.appEvents.trigger("draft:destroyed", key)
       );
     } else {
-      return Ember.RSVP.Promise.resolve();
+      return Promise.resolve();
     }
   },
 
@@ -962,7 +963,7 @@ export default Controller.extend({
     }
 
     if (_checkDraftPopup) {
-      return new Ember.RSVP.Promise(resolve => {
+      return new Promise(resolve => {
         bootbox.dialog(I18n.t("drafts.abandon.confirm"), [
           {
             label: I18n.t("drafts.abandon.no_value"),
@@ -988,7 +989,7 @@ export default Controller.extend({
     const keyPrefix =
       this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
 
-    return new Ember.RSVP.Promise(resolve => {
+    return new Promise(resolve => {
       if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
         bootbox.dialog(I18n.t(keyPrefix + ".confirm"), [
           {
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
index 8e88d41ad5..287b6a6994 100644
--- a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -6,6 +6,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
+import { all } from "rsvp";
 
 export default Controller.extend(ModalFunctionality, GrantBadgeController, {
   topicController: inject("topic"),
@@ -42,7 +43,7 @@ export default Controller.extend(ModalFunctionality, GrantBadgeController, {
   onShow() {
     this.set("loading", true);
 
-    Ember.RSVP.all([
+    all([
       Badge.findAll(),
       UserBadge.findByUsername(this.get("post.username"))
     ]).then(([allBadges, userBadges]) => {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 291e07d29b..af63f140be 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -25,6 +25,7 @@ import { spinnerHTML } from "discourse/helpers/loading-spinner";
 import { userPath } from "discourse/lib/url";
 import showModal from "discourse/lib/show-modal";
 import TopicTimer from "discourse/models/topic-timer";
+import { Promise } from "rsvp";
 
 let customPostMessageCallbacks = {};
 
@@ -268,7 +269,7 @@ export default Controller.extend(bufferedProperty("model"), {
     selectText(postId, buffer) {
       const loadedPost = this.get("model.postStream").findLoadedPost(postId);
       const promise = loadedPost
-        ? Ember.RSVP.resolve(loadedPost)
+        ? Promise.resolve(loadedPost)
         : this.get("model.postStream").loadPost(postId);
 
       return promise.then(post => {
@@ -826,7 +827,7 @@ export default Controller.extend(bufferedProperty("model"), {
     },
 
     addNotice(post) {
-      return new Ember.RSVP.Promise(function(resolve, reject) {
+      return new Promise(function(resolve, reject) {
         const controller = showModal("add-post-notice");
         controller.setProperties({ post, resolve, reject });
       });
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js.es6
index e2bb45ef08..40fd85d686 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax.js.es6
@@ -1,6 +1,7 @@
 import { run } from "@ember/runloop";
 import pageVisible from "discourse/lib/page-visible";
 import logout from "discourse/lib/logout";
+import { Promise } from "rsvp";
 
 let _trackView = false;
 let _transientHeader = null;
@@ -163,13 +164,13 @@ export function ajax() {
     url !== Discourse.getURL("/clicks/track") &&
     !Discourse.Session.currentProp("csrfToken")
   ) {
-    promise = new Ember.RSVP.Promise((resolve, reject) => {
+    promise = new Promise((resolve, reject) => {
       ajaxObj = updateCsrfToken().then(() => {
         performAjax(resolve, reject);
       });
     });
   } else {
-    promise = new Ember.RSVP.Promise(performAjax);
+    promise = new Promise(performAjax);
   }
 
   promise.abort = () => {
diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
index 164839fabf..0b46e05b73 100644
--- a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
@@ -3,6 +3,7 @@ import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import Category from "discourse/models/category";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 import { SEPARATOR } from "discourse/lib/category-hashtags";
+import { Promise } from "rsvp";
 
 var cache = {};
 var cacheTime;
@@ -15,7 +16,7 @@ function updateCache(term, results) {
 }
 
 function searchTags(term, categories, limit) {
-  return new Ember.RSVP.Promise(resolve => {
+  return new Promise(resolve => {
     const clearPromise = setTimeout(() => {
       resolve(CANCELLED_STATUS);
     }, 5000);
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index 6e27ebbbe2..12abc76152 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -3,6 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { selectedText } from "discourse/lib/utilities";
+import { Promise } from "rsvp";
 
 export function isValidLink($link) {
   // Do not track:
@@ -96,7 +97,7 @@ export default {
       }
     }
 
-    let trackPromise = Ember.RSVP.resolve();
+    let trackPromise = Promise.resolve();
     if (tracking) {
       if (!Ember.testing && navigator.sendBeacon) {
         const data = new FormData();
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 330772014d..52c0449285 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -2,6 +2,7 @@ import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import KeyValueStore from "discourse/lib/key-value-store";
 import { formatUsername } from "discourse/lib/utilities";
+import { Promise } from "rsvp";
 
 let primaryTab = false;
 let liveEnabled = false;
@@ -189,11 +190,11 @@ function onNotification(data) {
 // Wraps Notification.requestPermission in a Promise
 function requestPermission() {
   if (havePermission === true) {
-    return Ember.RSVP.resolve();
+    return Promise.resolve();
   } else if (havePermission === false) {
-    return Ember.RSVP.reject();
+    return Promise.reject();
   } else {
-    return new Ember.RSVP.Promise(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
       Notification.requestPermission(function(status) {
         if (status === "granted") {
           resolve();
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index c1f11ec0f4..1efec2ea78 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -1,5 +1,7 @@
 import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
+import { Promise } from "rsvp";
+
 const _loaded = {};
 const _loading = {};
 
@@ -38,7 +40,7 @@ export function loadCSS(url) {
 export default function loadScript(url, opts) {
   // TODO: Remove this once plugins have been updated not to use it:
   if (url === "defer/html-sanitizer-bundle") {
-    return Ember.RSVP.Promise.resolve();
+    return Promise.resolve();
   }
 
   opts = opts || {};
@@ -55,7 +57,7 @@ export default function loadScript(url, opts) {
     }
   });
 
-  return new Ember.RSVP.Promise(function(resolve) {
+  return new Promise(function(resolve) {
     // If we already loaded this url
     if (_loaded[url]) {
       return resolve();
@@ -65,7 +67,7 @@ export default function loadScript(url, opts) {
     }
 
     let done;
-    _loading[url] = new Ember.RSVP.Promise(function(_done) {
+    _loading[url] = new Promise(function(_done) {
       done = _done;
     });
 
diff --git a/app/assets/javascripts/discourse/lib/pwa-utils.js.es6 b/app/assets/javascripts/discourse/lib/pwa-utils.js.es6
index c1833da32b..1e2c901bd6 100644
--- a/app/assets/javascripts/discourse/lib/pwa-utils.js.es6
+++ b/app/assets/javascripts/discourse/lib/pwa-utils.js.es6
@@ -1,6 +1,8 @@
+import { Promise } from "rsvp";
+
 export function nativeShare(data) {
   const caps = Discourse.__container__.lookup("capabilities:main");
-  return new Ember.RSVP.Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     if (!(caps.isIOS || caps.isAndroid || caps.isWinphone)) {
       reject();
       return;
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index cb02036ced..2767426c09 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -4,6 +4,7 @@ import WhiteLister from "pretty-text/white-lister";
 import { sanitize as textSanitize } from "pretty-text/sanitizer";
 import loadScript from "discourse/lib/load-script";
 import { formatUsername } from "discourse/lib/utilities";
+import { Promise } from "rsvp";
 
 function getOpts(opts) {
   const siteSettings = Discourse.__container__.lookup("site-settings:main"),
@@ -51,7 +52,7 @@ function loadMarkdownIt() {
       console.error(e);
     });
   } else {
-    return Ember.RSVP.Promise.resolve();
+    return Promise.resolve();
   }
 }
 
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index 5288fae589..63fbb2da71 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -2,6 +2,7 @@ import debounce from "discourse/lib/debounce";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import { userPath } from "discourse/lib/url";
 import { emailValid } from "discourse/lib/utilities";
+import { Promise } from "rsvp";
 
 var cache = {},
   cacheKey,
@@ -166,7 +167,7 @@ export default function userSearch(options) {
 
   currentTerm = term;
 
-  return new Ember.RSVP.Promise(function(resolve) {
+  return new Promise(function(resolve) {
     const newCacheKey = `${topicId}-${categoryId}`;
 
     if (new Date() - cacheTime > 30000 || cacheKey !== newCacheKey) {
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index ee0009246e..88203b5084 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -4,6 +4,7 @@ import { ajax } from "discourse/lib/ajax";
 import BadgeGrouping from "discourse/models/badge-grouping";
 import RestModel from "discourse/models/rest";
 import computed from "ember-addons/ember-computed-decorators";
+import { Promise } from "rsvp";
 
 const Badge = RestModel.extend({
   newBadge: none("id"),
@@ -53,7 +54,7 @@ const Badge = RestModel.extend({
   },
 
   destroy() {
-    if (this.newBadge) return Ember.RSVP.resolve();
+    if (this.newBadge) return Promise.resolve();
 
     return ajax(`/admin/badges/${this.id}`, {
       type: "DELETE"
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 57b0478e2a..3648107d6f 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -17,6 +17,7 @@ import {
 import { escapeExpression, tinyAvatar } from "discourse/lib/utilities";
 import { propertyNotEqual } from "discourse/lib/computed";
 import throttle from "discourse/lib/throttle";
+import { Promise } from "rsvp";
 
 // The actions the composer can take
 export const CREATE_TOPIC = "createTopic",
@@ -755,7 +756,7 @@ const Composer = RestModel.extend({
 
   // Overwrite to implement custom logic
   beforeSave() {
-    return Ember.RSVP.Promise.resolve();
+    return Promise.resolve();
   },
 
   save(opts) {
@@ -792,7 +793,7 @@ const Composer = RestModel.extend({
   editPost(opts) {
     const post = this.post;
     const oldCooked = post.cooked;
-    let promise = Ember.RSVP.resolve();
+    let promise = Promise.resolve();
 
     // Update the topic if we're editing the first post
     if (this.title && post.post_number === 1) {
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index f8a4a03610..54baf013f5 100644
--- a/app/assets/javascripts/discourse/models/invite.js.es6
+++ b/app/assets/javascripts/discourse/models/invite.js.es6
@@ -2,6 +2,7 @@ import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { userPath } from "discourse/lib/url";
+import { Promise } from "rsvp";
 
 const Invite = Discourse.Model.extend({
   rescind() {
@@ -32,7 +33,7 @@ Invite.reopenClass({
   },
 
   findInvitedBy(user, filter, search, offset) {
-    if (!user) Ember.RSVP.resolve();
+    if (!user) Promise.resolve();
 
     const data = {};
     if (!Ember.isNone(filter)) data.filter = filter;
@@ -48,7 +49,7 @@ Invite.reopenClass({
   },
 
   findInvitedCount(user) {
-    if (!user) Ember.RSVP.resolve();
+    if (!user) Promise.resolve();
 
     return ajax(userPath(`${user.username_lower}/invited_count.json`)).then(
       result => EmberObject.create(result.counts)
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js.es6
index 6e7de67e55..0bfddf3951 100644
--- a/app/assets/javascripts/discourse/models/login-method.js.es6
+++ b/app/assets/javascripts/discourse/models/login-method.js.es6
@@ -1,6 +1,7 @@
 import EmberObject from "@ember/object";
 import computed from "ember-addons/ember-computed-decorators";
 import { updateCsrfToken } from "discourse/lib/ajax";
+import { Promise } from "rsvp";
 
 const LoginMethod = EmberObject.extend({
   @computed
@@ -21,12 +22,12 @@ const LoginMethod = EmberObject.extend({
   doLogin({ reconnect = false } = {}) {
     if (this.customLogin) {
       this.customLogin();
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     if (this.custom_url) {
       window.location = this.custom_url;
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     let authUrl = Discourse.getURL(`/auth/${this.name}`);
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index ae634fbd31..6baafb909b 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -7,6 +7,7 @@ import RestModel from "discourse/models/rest";
 import PostsWithPlaceholders from "discourse/lib/posts-with-placeholders";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { loadTopicView } from "discourse/models/topic";
+import { Promise } from "rsvp";
 
 export default RestModel.extend({
   _identityMap: null,
@@ -255,7 +256,7 @@ export default RestModel.extend({
     } else {
       const postWeWant = this.posts.findBy("post_number", opts.nearPost);
       if (postWeWant) {
-        return Ember.RSVP.resolve();
+        return Promise.resolve();
       }
     }
 
@@ -317,7 +318,7 @@ export default RestModel.extend({
         });
       }
     }
-    return Ember.RSVP.resolve();
+    return Promise.resolve();
   },
 
   // Fill in a gap of posts after a particular post
@@ -333,14 +334,14 @@ export default RestModel.extend({
         this.stream.arrayContentDidChange();
       });
     }
-    return Ember.RSVP.resolve();
+    return Promise.resolve();
   },
 
   // Appends the next window of posts to the stream. Call it when scrolling downwards.
   appendMore() {
     // Make sure we can append more posts
     if (!this.canAppendMore) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     const postsWithPlaceholders = this.postsWithPlaceholders;
@@ -363,7 +364,7 @@ export default RestModel.extend({
       });
     } else {
       const postIds = this.nextWindow;
-      if (isEmpty(postIds)) return Ember.RSVP.resolve();
+      if (isEmpty(postIds)) return Promise.resolve();
       this.set("loadingBelow", true);
       postsWithPlaceholders.appending(postIds);
 
@@ -383,7 +384,7 @@ export default RestModel.extend({
   prependMore() {
     // Make sure we can append more posts
     if (!this.canPrependMore) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     if (this.isMegaTopic) {
@@ -404,7 +405,7 @@ export default RestModel.extend({
       });
     } else {
       const postIds = this.previousWindow;
-      if (isEmpty(postIds)) return Ember.RSVP.resolve();
+      if (isEmpty(postIds)) return Promise.resolve();
       this.set("loadingAbove", true);
 
       return this.findPostsByIds(postIds.reverse())
@@ -580,7 +581,7 @@ export default RestModel.extend({
     have no filters.
   **/
   triggerNewPostInStream(postId) {
-    const resolved = Ember.RSVP.Promise.resolve();
+    const resolved = Promise.resolve();
 
     if (!postId) {
       return resolved;
@@ -680,13 +681,13 @@ export default RestModel.extend({
           this.removePosts([existing]);
         });
     }
-    return Ember.RSVP.Promise.resolve();
+    return Promise.resolve();
   },
 
   triggerChangedPost(postId, updatedAt, opts) {
     opts = opts || {};
 
-    const resolved = Ember.RSVP.Promise.resolve();
+    const resolved = Promise.resolve();
     if (!postId) {
       return resolved;
     }
@@ -707,7 +708,7 @@ export default RestModel.extend({
   },
 
   triggerReadPost(postId, readersCount) {
-    const resolved = Ember.RSVP.Promise.resolve();
+    const resolved = Promise.resolve();
     resolved.then(() => {
       const post = this.findLoadedPost(postId);
       if (post && readersCount > post.readers_count) {
@@ -958,7 +959,7 @@ export default RestModel.extend({
 
   loadIntoIdentityMap(postIds) {
     if (isEmpty(postIds)) {
-      return Ember.RSVP.resolve([]);
+      return Promise.resolve([]);
     }
 
     let includeSuggested = !this.get("topic.suggested_topics");
@@ -1029,12 +1030,12 @@ export default RestModel.extend({
 
   excerpt(streamPosition) {
     if (this.isMegaTopic) {
-      return new Ember.RSVP.Promise(resolve => resolve(""));
+      return new Promise(resolve => resolve(""));
     }
 
     const stream = this.stream;
 
-    return new Ember.RSVP.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       let excerpt = this._excerpts && this._excerpts[stream[streamPosition]];
 
       if (excerpt) {
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 382b369c56..4fbfcdeea0 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -13,6 +13,7 @@ import { postUrl } from "discourse/lib/utilities";
 import { cookAsync } from "discourse/lib/text";
 import { userPath } from "discourse/lib/url";
 import Composer from "discourse/models/composer";
+import { Promise } from "rsvp";
 
 const Post = RestModel.extend({
   // TODO: Remove this once one instantiate all `Discourse.Post` models via the store.
@@ -230,7 +231,7 @@ const Post = RestModel.extend({
       });
     }
 
-    return promise || Ember.RSVP.Promise.resolve();
+    return promise || Promise.resolve();
   },
 
   /**
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index 9ca2f5d0db..a140dad504 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -1,5 +1,6 @@
 import { equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
+import { Promise } from "rsvp";
 
 const RestModel = EmberObject.extend({
   isNew: equal("__state", "new"),
@@ -11,7 +12,7 @@ const RestModel = EmberObject.extend({
 
   update(props) {
     if (this.isSaving) {
-      return Ember.RSVP.reject();
+      return Promise.reject();
     }
 
     props = props || this.updateProperties();
@@ -39,7 +40,7 @@ const RestModel = EmberObject.extend({
 
   _saveNew(props) {
     if (this.isSaving) {
-      return Ember.RSVP.reject();
+      return Promise.reject();
     }
 
     props = props || this.createProperties();
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js.es6
index dc9f1f9ec4..436abfd2de 100644
--- a/app/assets/javascripts/discourse/models/result-set.js.es6
+++ b/app/assets/javascripts/discourse/models/result-set.js.es6
@@ -1,4 +1,5 @@
 import computed from "ember-addons/ember-computed-decorators";
+import { Promise } from "rsvp";
 
 export default Ember.ArrayProxy.extend({
   loading: false,
@@ -34,7 +35,7 @@ export default Ember.ArrayProxy.extend({
         .finally(() => this.set("loadingMore", false));
     }
 
-    return Ember.RSVP.resolve();
+    return Promise.resolve();
   },
 
   refresh() {
diff --git a/app/assets/javascripts/discourse/models/reviewable.js.es6 b/app/assets/javascripts/discourse/models/reviewable.js.es6
index 25fc62f63d..892822c59e 100644
--- a/app/assets/javascripts/discourse/models/reviewable.js.es6
+++ b/app/assets/javascripts/discourse/models/reviewable.js.es6
@@ -2,6 +2,7 @@ import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import computed from "ember-addons/ember-computed-decorators";
 import Category from "discourse/models/category";
+import { Promise } from "rsvp";
 
 export const PENDING = 0;
 export const APPROVED = 1;
@@ -25,7 +26,7 @@ export default RestModel.extend({
   update(updates) {
     // If no changes, do nothing
     if (Object.keys(updates).length === 0) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     let adapter = this.store.adapterFor("reviewable");
diff --git a/app/assets/javascripts/discourse/models/static-page.js.es6 b/app/assets/javascripts/discourse/models/static-page.js.es6
index 50c63e083c..57bb3cc2df 100644
--- a/app/assets/javascripts/discourse/models/static-page.js.es6
+++ b/app/assets/javascripts/discourse/models/static-page.js.es6
@@ -4,7 +4,7 @@ const StaticPage = EmberObject.extend();
 
 StaticPage.reopenClass({
   find(path) {
-    return new Ember.RSVP.Promise(resolve => {
+    return new Promise(resolve => {
       // Models shouldn't really be doing Ajax request, but this is a huge speed boost if we
       // preload content.
       const $preloaded = $('noscript[data-path="/' + path + '"]');
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 841def676f..3160fff6f5 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -210,7 +210,7 @@ export default EmberObject.extend({
     // If the record is new, don't perform an Ajax call
     if (record.get("isNew")) {
       removeMap(type, record.get("id"));
-      return Ember.RSVP.Promise.resolve(true);
+      return Promise.resolve(true);
     }
 
     return this.adapterFor(type)
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index d9c9b211de..da01a6899d 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -4,6 +4,7 @@ import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import Model from "discourse/models/model";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { Promise } from "rsvp";
 
 // Whether to show the category badge in topic lists
 function displayCategoryInList(site, category) {
@@ -54,7 +55,7 @@ const TopicList = RestModel.extend({
 
   loadMore() {
     if (this.loadingMore) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     let moreUrl = this.more_topics_url;
@@ -97,7 +98,7 @@ const TopicList = RestModel.extend({
       });
     } else {
       // Return a promise indicating no more results
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
   },
 
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index b7614afddf..f4bf6c6533 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -374,7 +374,7 @@ const Topic = RestModel.extend({
 
   toggleBookmark() {
     if (this.bookmarking) {
-      return Ember.RSVP.Promise.resolve();
+      return Promise.resolve();
     }
     this.set("bookmarking", true);
 
@@ -417,7 +417,7 @@ const Topic = RestModel.extend({
       );
     }
 
-    return new Ember.RSVP.Promise(resolve => {
+    return new Promise(resolve => {
       if (unbookmarkedPosts.length > 1) {
         bootbox.confirm(
           I18n.t("bookmarks.confirm_clear"),
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js.es6
index a8850674a4..69e88caf2e 100644
--- a/app/assets/javascripts/discourse/models/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/models/user-badge.js.es6
@@ -1,6 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
 import computed from "ember-addons/ember-computed-decorators";
+import { Promise } from "rsvp";
 
 const UserBadge = Discourse.Model.extend({
   @computed
@@ -96,7 +97,7 @@ UserBadge.reopenClass({
   **/
   findByUsername: function(username, options) {
     if (!username) {
-      return Ember.RSVP.resolve([]);
+      return Promise.resolve([]);
     }
     var url = "/user-badges/" + username + ".json";
     if (options && options.grouped) {
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 c384b49569..ee1d3cccad 100644
--- a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
@@ -4,7 +4,7 @@ import RestModel from "discourse/models/rest";
 import UserDraft from "discourse/models/user-draft";
 import { emojiUnescape } from "discourse/lib/text";
 import computed from "ember-addons/ember-computed-decorators";
-
+import { Promise } from "rsvp";
 import {
   NEW_TOPIC_KEY,
   NEW_PRIVATE_MESSAGE_KEY
@@ -55,11 +55,11 @@ export default RestModel.extend({
 
     const lastLoadedUrl = this.lastLoadedUrl;
     if (lastLoadedUrl === findUrl) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     if (this.loading) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     this.set("loading", true);
diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
index 7521b82dce..74cadcb455 100644
--- a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
@@ -2,6 +2,7 @@ import { on } from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import UserAction from "discourse/models/user-action";
+import { Promise } from "rsvp";
 
 export default Discourse.Model.extend({
   loaded: false,
@@ -24,7 +25,7 @@ export default Discourse.Model.extend({
 
   filterBy(opts) {
     if (this.loaded && this.filter === opts.filter) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     this.setProperties(
@@ -43,7 +44,7 @@ export default Discourse.Model.extend({
 
   findItems() {
     if (this.loading || !this.canLoadMore) {
-      return Ember.RSVP.reject();
+      return Promise.reject();
     }
 
     this.set("loading", true);
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index 35e44cc661..1a90ebd940 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -3,6 +3,7 @@ import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
 import UserAction from "discourse/models/user-action";
 import { emojiUnescape } from "discourse/lib/text";
+import { Promise } from "rsvp";
 import {
   default as computed,
   on
@@ -92,11 +93,11 @@ export default RestModel.extend({
     // Don't load the same stream twice. We're probably at the end.
     const lastLoadedUrl = this.lastLoadedUrl;
     if (lastLoadedUrl === findUrl) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     if (this.loading) {
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     }
 
     this.set("loading", true);
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 6ce6bf90cd..af2a0dd2fc 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -23,6 +23,7 @@ import PreloadStore from "preload-store";
 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";
 
 export const SECOND_FACTOR_METHODS = {
@@ -583,7 +584,7 @@ const User = RestModel.extend({
 
   findStaffInfo() {
     if (!Discourse.User.currentProp("staff")) {
-      return Ember.RSVP.resolve(null);
+      return Promise.resolve(null);
     }
     return ajax(userPath(`${this.username_lower}/staff-info.json`)).then(
       info => {
@@ -672,7 +673,7 @@ const User = RestModel.extend({
         data: { context: window.location.pathname }
       });
     } else {
-      return Ember.RSVP.reject(I18n.t("user.delete_yourself_not_allowed"));
+      return Promise.reject(I18n.t("user.delete_yourself_not_allowed"));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index 9197a77cc1..86b8f0d4af 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -2,6 +2,7 @@ import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import Badge from "discourse/models/badge";
 import PreloadStore from "preload-store";
+import { hash } from "rsvp";
 
 export default DiscourseRoute.extend({
   queryParams: {
@@ -52,7 +53,7 @@ export default DiscourseRoute.extend({
       userBadgesAll
     };
 
-    return Ember.RSVP.hash(promises);
+    return hash(promises);
   },
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index 99c41ed640..06259b920c 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -8,6 +8,7 @@ import TopicList from "discourse/models/topic-list";
 import PermissionType from "discourse/models/permission-type";
 import CategoryList from "discourse/models/category-list";
 import Category from "discourse/models/category";
+import { Promise, all } from "rsvp";
 
 // A helper function to create a category route with parameters
 export default (filterArg, params) => {
@@ -50,7 +51,7 @@ export default (filterArg, params) => {
       }
 
       this._setupNavigation(model.category);
-      return Ember.RSVP.all([
+      return all([
         this._createSubcategoryList(model.category),
         this._retrieveTopicList(model.category, transition)
       ]);
@@ -87,7 +88,7 @@ export default (filterArg, params) => {
       }
 
       // If we're not loading a subcategory list just resolve
-      return Ember.RSVP.resolve();
+      return Promise.resolve();
     },
 
     _retrieveTopicList(category, transition) {
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index fb4249205d..5d0a576005 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -18,7 +18,7 @@ function filterQueryParams(params, defaultParams) {
 
 function findTopicList(store, tracking, filter, filterParams, extras) {
   extras = extras || {};
-  return new Ember.RSVP.Promise(function(resolve) {
+  return new Promise(function(resolve) {
     const session = Discourse.Session.current();
 
     if (extras.cached) {
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 125b6bf9d0..f5bafdf12b 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -9,6 +9,7 @@ import TopicList from "discourse/models/topic-list";
 import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "preload-store";
 import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
+import { hash } from "rsvp";
 
 const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
   renderTemplate() {
@@ -44,11 +45,11 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
   },
 
   _findCategoriesAndTopics(filter) {
-    return Ember.RSVP.hash({
+    return hash({
       wrappedCategoriesList: PreloadStore.getAndRemove("categories_list"),
       topicsList: PreloadStore.getAndRemove(`topic_list_${filter}`)
-    }).then(hash => {
-      let { wrappedCategoriesList, topicsList } = hash;
+    }).then(response => {
+      let { wrappedCategoriesList, topicsList } = response;
       let categoriesList =
         wrappedCategoriesList && wrappedCategoriesList.category_list;
 
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 3c70593130..780cb20e1f 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -4,6 +4,7 @@ import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
 import showModal from "discourse/lib/show-modal";
+import { Promise } from "rsvp";
 
 const LIKE_ACTION = 2;
 
@@ -575,7 +576,7 @@ export default createWidget("post-menu", {
     this.state.collapsed = false;
     const likesPromise = !this.state.likedUsers.length
       ? this.getWhoLiked()
-      : Ember.RSVP.resolve();
+      : Promise.resolve();
 
     return likesPromise.then(() => {
       if (!this.state.readers.length && this.attrs.showReadIndicator) {
@@ -601,7 +602,7 @@ export default createWidget("post-menu", {
     $heart.closest("button").addClass("has-like");
 
     const scale = [1.0, 1.5];
-    return new Ember.RSVP.Promise(resolve => {
+    return new Promise(resolve => {
       animateHeart($heart, scale[0], scale[1], () => {
         animateHeart($heart, scale[1], scale[0], () => {
           this.sendWidgetAction("toggleLike").then(() => resolve());
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 12eadf99cb..8eec4318a8 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -588,7 +588,7 @@ createWidget("post-article", {
       if (topicUrl) {
         DiscourseURL.routeTo(`${topicUrl}/${replyPostNumber}`);
       }
-      return Ember.RSVP.Promise.resolve();
+      return Promise.resolve();
     }
 
     if (this.state.repliesAbove.length) {
@@ -598,7 +598,7 @@ createWidget("post-article", {
           `${this.attrs.topicUrl}/${this.attrs.post_number}`
         );
       }
-      return Ember.RSVP.Promise.resolve();
+      return Promise.resolve();
     } else {
       const topicUrl = this._getTopicUrl();
       return this.store
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
index e70985fde2..904629b818 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
@@ -22,7 +22,7 @@ export default createWidget("quick-access-panel", {
   },
 
   markReadRequest() {
-    return Ember.RSVP.Promise.resolve();
+    return Promise.resolve();
   },
 
   hasUnread() {
@@ -38,7 +38,7 @@ export default createWidget("quick-access-panel", {
   },
 
   findNewItems() {
-    return Ember.RSVP.Promise.resolve([]);
+    return Promise.resolve([]);
   },
 
   newItemsLoaded() {},
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
index 761ebf085f..f2bfc7ffb7 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
@@ -10,7 +10,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
   },
 
   findNewItems() {
-    return Ember.RSVP.Promise.resolve(this._getItems());
+    return Promise.resolve(this._getItems());
   },
 
   itemHtml(item) {
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index f6f5f78b91..ed848faa0d 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -8,6 +8,7 @@ import {
 } from "discourse/widgets/hooks";
 import { h } from "virtual-dom";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
+import { Promise } from "rsvp";
 
 const _registry = {};
 
@@ -265,12 +266,12 @@ export default class Widget {
 
       if (typeof method === "string") {
         view[method](param);
-        promise = Ember.RSVP.resolve();
+        promise = Promise.resolve();
       } else {
         const target = view.get("target") || view;
         promise = method.call(target, param);
         if (!promise || !promise.then) {
-          promise = Ember.RSVP.resolve(promise);
+          promise = Promise.resolve(promise);
         }
       }
     }

From ca6adfbdd6c8c648eaec740031adf06f51b73bdf Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 5 Nov 2019 11:52:04 -0500
Subject: [PATCH 317/328] DEV: Ignore renames when diffing theme changes

Renamed assets are quite noisy when checking whether a remote theme has local changes.
---
 lib/theme_store/git_importer.rb  | 2 +-
 spec/models/remote_theme_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index 8fe88cfeb2..b844547e7d 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -40,7 +40,7 @@ class ThemeStore::GitImporter
       Discourse::Utils.execute_command("git", "checkout", "about.json")
       # adding and diffing on staged so that we catch uploads
       Discourse::Utils.execute_command("git", "add", "-A")
-      return Discourse::Utils.execute_command("git", "diff", "--staged")
+      return Discourse::Utils.execute_command("git", "diff", "--staged", "--no-renames")
     end
   ensure
     FileUtils.rm_rf local_temp_folder if local_temp_folder
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index f27c73242d..e1e8af9fb4 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -170,6 +170,7 @@ describe RemoteTheme do
       @theme.save
       @theme.reload
 
+      expect(remote.diff_local_changes[:diff]).not_to include("similarity index 100%")
       expect(remote.diff_local_changes[:diff]).to include("background-color: blue")
     end
   end

From 61b1f9c36be9b87e8ef5040cca41f93ac35396c2 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 5 Nov 2019 02:15:44 +0100
Subject: [PATCH 318/328] FEATURE: Load translation overrides without JS `eval`

---
 .../initializers/localization.js.es6          | 23 +++----
 app/controllers/application_controller.rb     |  1 -
 app/controllers/extra_locales_controller.rb   | 61 +++++++++--------
 app/helpers/application_helper.rb             |  9 ++-
 app/models/translation_override.rb            |  1 +
 app/views/layouts/application.html.erb        |  5 +-
 app/views/wizard/index.html.erb               |  5 +-
 config/initializers/100-i18n.rb               |  5 +-
 lib/freedom_patches/translate_accelerator.rb  |  8 +--
 lib/js_locale_helper.rb                       | 33 +++++++++
 .../translate_accelerator_spec.rb             | 21 ------
 spec/helpers/application_helper_spec.rb       | 17 +++--
 .../requests/extra_locales_controller_spec.rb | 68 ++++++++++++++++++-
 .../initializers/localization-test.js.es6     | 11 +--
 14 files changed, 181 insertions(+), 87 deletions(-)

diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js.es6
index fc9eee1536..cbe50e53d5 100644
--- a/app/assets/javascripts/discourse/initializers/localization.js.es6
+++ b/app/assets/javascripts/discourse/initializers/localization.js.es6
@@ -1,5 +1,3 @@
-import PreloadStore from "preload-store";
-
 export default {
   name: "localization",
   after: "inject-objects",
@@ -21,20 +19,9 @@ export default {
     }
 
     // Merge any overrides into our object
-    const overrides = PreloadStore.get("translationOverrides") || {};
+    const overrides = I18n._overrides || {};
     Object.keys(overrides).forEach(k => {
       const v = overrides[k];
-
-      // Special case: Message format keys are functions
-      if (/_MF$/.test(k)) {
-        k = k.replace(/^[a-z_]*js\./, "");
-        I18n._compiledMFs[k] = new Function(
-          "transKey",
-          `return (${v})(transKey);`
-        );
-        return;
-      }
-
       k = k.replace("admin_js", "js");
 
       const segs = k.split(".");
@@ -52,6 +39,14 @@ export default {
       }
     });
 
+    const mfOverrides = I18n._mfOverrides || {};
+    Object.keys(mfOverrides).forEach(k => {
+      const v = mfOverrides[k];
+
+      k = k.replace(/^[a-z_]*js\./, "");
+      I18n._compiledMFs[k] = v;
+    });
+
     bootbox.addLocale(I18n.currentLocale(), {
       OK: I18n.t("composer.modal_ok"),
       CANCEL: I18n.t("composer.modal_cancel"),
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1cd6bd39e5..3c19910598 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -520,7 +520,6 @@ class ApplicationController < ActionController::Base
     store_preloaded("customHTML", custom_html_json)
     store_preloaded("banner", banner_json)
     store_preloaded("customEmoji", custom_emoji)
-    store_preloaded("translationOverrides", I18n.client_overrides_json(I18n.locale))
   end
 
   def preload_current_user_data
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index 43560c8660..4bee444976 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -8,57 +8,64 @@ class ExtraLocalesController < ApplicationController
     :redirect_to_login_if_required,
     :verify_authenticity_token
 
+  OVERRIDES_BUNDLE ||= 'overrides'
+
   def show
     bundle = params[:bundle]
 
-    raise Discourse::InvalidAccess.new if bundle !~ /^(admin|wizard)$/ || !current_user&.staff?
+    raise Discourse::InvalidAccess.new if !valid_bundle?(bundle)
 
     if params[:v]&.size == 32
       hash = ExtraLocalesController.bundle_js_hash(bundle)
-      immutable_for(24.hours) if hash == params[:v]
+      immutable_for(1.year) if hash == params[:v]
     end
 
     render plain: ExtraLocalesController.bundle_js(bundle), content_type: "application/javascript"
   end
 
   def self.bundle_js_hash(bundle)
-    @bundle_js_hash ||= {}
-    @bundle_js_hash["#{bundle}_#{I18n.locale}"] ||= Digest::MD5.hexdigest(bundle_js(bundle))
+    if bundle == OVERRIDES_BUNDLE
+      site = RailsMultisite::ConnectionManagement.current_db
+
+      @by_site ||= {}
+      @by_site[site] ||= {}
+      @by_site[site][I18n.locale] ||= begin
+        js = bundle_js(bundle)
+        js.present? ? Digest::MD5.hexdigest(js) : nil
+      end
+    else
+      @bundle_js_hash ||= {}
+      @bundle_js_hash["#{bundle}_#{I18n.locale}"] ||= Digest::MD5.hexdigest(bundle_js(bundle))
+    end
   end
 
   def self.url(bundle)
-    if Rails.env == "production"
-      "#{Discourse.base_uri}/extra-locales/#{bundle}?v=#{bundle_js_hash(bundle)}"
-    else
-      "#{Discourse.base_uri}/extra-locales/#{bundle}"
-    end
+    "#{Discourse.base_uri}/extra-locales/#{bundle}?v=#{bundle_js_hash(bundle)}"
+  end
+
+  def self.client_overrides_exist?
+    bundle_js_hash(OVERRIDES_BUNDLE).present?
   end
 
   def self.bundle_js(bundle)
     locale_str = I18n.locale.to_s
     bundle_str = "#{bundle}_js"
 
-    translations = JsLocaleHelper.translations_for(locale_str)
-
-    translations.keys.each do |l|
-      translations[l].keys.each do |k|
-        bundle_translations = translations[l].delete(k)
-        translations[l].deep_merge!(bundle_translations) if k == bundle_str
-      end
+    if bundle == OVERRIDES_BUNDLE
+      JsLocaleHelper.output_client_overrides(locale_str)
+    else
+      JsLocaleHelper.output_extra_locales(bundle_str, locale_str)
     end
+  end
 
-    js = ""
+  def self.clear_cache!
+    site = RailsMultisite::ConnectionManagement.current_db
+    @by_site&.delete(site)
+  end
 
-    if translations.present?
-      js = <<~JS.squish
-        (function() {
-          if (window.I18n) {
-            window.I18n.extras = #{translations.to_json};
-          }
-        })();
-      JS
-    end
+  private
 
-    js
+  def valid_bundle?(bundle)
+    bundle == OVERRIDES_BUNDLE || (bundle =~ /^(admin|wizard)$/ && current_user&.staff?)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 96531a9a18..f4ef9660d6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -93,9 +93,14 @@ module ApplicationHelper
 
   def preload_script(script)
     path = script_asset_path(script)
+    preload_script_url(path)
+  end
 
-"<link rel='preload' href='#{path}' as='script'/>
-<script src='#{path}'></script>".html_safe
+  def preload_script_url(url)
+    <<~HTML.html_safe
+      <link rel="preload" href="#{url}" as="script">
+      <script src="#{url}"></script>
+    HTML
   end
 
   def discourse_csrf_tags
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 95e4183589..bef0c3eb1d 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -39,6 +39,7 @@ class TranslationOverride < ActiveRecord::Base
 
   def self.i18n_changed(keys)
     I18n.reload!
+    ExtraLocalesController.clear_cache!
     MessageBus.publish('/i18n-flush', refresh: true)
 
     keys.flatten.each do |key|
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index fdebcba6f2..3340017d75 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -20,6 +20,9 @@
     <%= build_plugin_html 'server:before-script-load' %>
 
     <%= preload_script "locales/#{I18n.locale}" %>
+    <%- if ExtraLocalesController.client_overrides_exist? %>
+      <%= preload_script_url ExtraLocalesController.url('overrides') %>
+    <%- end %>
     <%= preload_script "ember_jquery" %>
     <%= preload_script "preload-store" %>
     <%= preload_script "vendor" %>
@@ -29,7 +32,7 @@
       <%= preload_script file %>
     <%- end %>
     <%- if staff? %>
-      <script src="<%= ExtraLocalesController.url('admin') %>"></script>
+      <%= preload_script_url ExtraLocalesController.url('admin') %>
       <%= preload_script "admin" %>
     <%- end %>
 
diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index 9ccc5e3b15..382f68b433 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -3,9 +3,12 @@
     <%= discourse_stylesheet_link_tag :wizard, theme_ids: nil %>
     <%= preload_script 'ember_jquery' %>
     <%= preload_script "locales/#{I18n.locale}" %>
+    <%- if ExtraLocalesController.client_overrides_exist? %>
+      <%= preload_script_url ExtraLocalesController.url('overrides') %>
+    <%- end %>
     <%= preload_script 'wizard-vendor' %>
     <%= preload_script 'wizard-application' %>
-    <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
+    <%= preload_script_url ExtraLocalesController.url('wizard') %>
     <%= csrf_meta_tags %>
 
     <%= render partial: "layouts/head" %>
diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb
index d714de498d..10749264a4 100644
--- a/config/initializers/100-i18n.rb
+++ b/config/initializers/100-i18n.rb
@@ -12,5 +12,8 @@ I18n.reload!
 I18n.init_accelerator!
 
 unless Rails.env.test?
-  MessageBus.subscribe("/i18n-flush") { I18n.reload! }
+  MessageBus.subscribe("/i18n-flush") do
+    I18n.reload!
+    ExtraLocalesController.clear_cache!
+  end
 end
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index b2a0f51f86..26dff3594c 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -137,9 +137,10 @@ module I18n
 
     def overrides_by_locale(locale)
       return unless @overrides_enabled
-
       return {} if GlobalSetting.skip_db?
 
+      execute_reload if @requires_reload
+
       site = RailsMultisite::ConnectionManagement.current_db
 
       by_site = @overrides_by_site[site]
@@ -170,11 +171,6 @@ module I18n
       end
     end
 
-    def client_overrides_json(locale)
-      client_json = (overrides_by_locale(locale) || {}).select { |k, _| k[/^(admin_js|js)\./] }
-      MultiJson.dump(client_json)
-    end
-
     def translate(*args)
       execute_reload if @requires_reload
 
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 798a67fe87..99d344ef8c 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -159,6 +159,39 @@ module JsLocaleHelper
     result
   end
 
+  def self.output_client_overrides(locale)
+    translations = (I18n.overrides_by_locale(locale) || {}).select { |k, _| k[/^(admin_js|js)\./] }
+    return "" if translations.blank?
+
+    message_formats = {}
+
+    translations.delete_if do |key, value|
+      if key.to_s.end_with?("_MF")
+        message_formats[key] = value
+      end
+    end
+
+    message_formats = message_formats.map { |k, v| "#{k.inspect}: #{v}" }.join(", ")
+
+    <<~JS
+      I18n._mfOverrides = {#{message_formats}};
+      I18n._overrides = #{translations.to_json};
+    JS
+  end
+
+  def self.output_extra_locales(bundle, locale)
+    translations = translations_for(locale)
+
+    translations.keys.each do |l|
+      translations[l].keys.each do |k|
+        bundle_translations = translations[l].delete(k)
+        translations[l].deep_merge!(bundle_translations) if k == bundle
+      end
+    end
+
+    translations.present? ? "I18n.extras = #{translations.to_json};" : ""
+  end
+
   MOMENT_LOCALE_MAPPING ||= {
     "hy" => "hy-am",
     "en" => "en-gb"
diff --git a/spec/components/freedom_patches/translate_accelerator_spec.rb b/spec/components/freedom_patches/translate_accelerator_spec.rb
index fc12655881..9387564864 100644
--- a/spec/components/freedom_patches/translate_accelerator_spec.rb
+++ b/spec/components/freedom_patches/translate_accelerator_spec.rb
@@ -204,26 +204,5 @@ describe "translate accelerator" do
       override_translation('en', 'fish', 'fake fish')
       expect(Fish.model_name.human).to eq('Fish')
     end
-
-    describe "client json" do
-      it "is empty by default" do
-        expect(I18n.client_overrides_json('en')).to eq('{}')
-      end
-
-      it "doesn't return server overrides" do
-        override_translation('en', 'foo', 'bar')
-        expect(I18n.client_overrides_json('en')).to eq('{}')
-      end
-
-      it "returns client overrides" do
-        override_translation('en', 'js.foo', 'bar')
-        override_translation('en', 'admin_js.beep', 'boop')
-        json = ::JSON.parse(I18n.client_overrides_json('en'))
-
-        expect(json).to be_present
-        expect(json['js.foo']).to eq('bar')
-        expect(json['admin_js.beep']).to eq('boop')
-      end
-    end
   end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 20af731aaa..c03af37509 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -6,13 +6,20 @@ require 'rails_helper'
 describe ApplicationHelper do
 
   describe "preload_script" do
+    def preload_link(url)
+      <<~HTML
+          <link rel="preload" href="#{url}" as="script">
+          <script src="#{url}"></script>
+      HTML
+    end
+
     it "provides brotli links to brotli cdn" do
       set_cdn_url "https://awesome.com"
 
       helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
       link = helper.preload_script('application')
 
-      expect(link).to eq("<link rel='preload' href='https://awesome.com/brotli_asset/application.js' as='script'/>\n<script src='https://awesome.com/brotli_asset/application.js'></script>")
+      expect(link).to eq(preload_link("https://awesome.com/brotli_asset/application.js"))
     end
 
     context "with s3 CDN" do
@@ -45,26 +52,26 @@ describe ApplicationHelper do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
         link = helper.preload_script('application')
 
-        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.br.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.br.js'></script>")
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/application.br.js"))
       end
 
       it "gives s3 cdn if asset host is not set" do
         link = helper.preload_script('application')
 
-        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.js'></script>")
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/application.js"))
       end
 
       it "can fall back to gzip compression" do
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'gzip'
         link = helper.preload_script('application')
-        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.gz.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.gz.js'></script>")
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/application.gz.js"))
       end
 
       it "gives s3 cdn even if asset host is set" do
         set_cdn_url "https://awesome.com"
         link = helper.preload_script('application')
 
-        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.js'></script>")
+        expect(link).to eq(preload_link("https://s3cdn.com/assets/application.js"))
       end
     end
   end
diff --git a/spec/requests/extra_locales_controller_spec.rb b/spec/requests/extra_locales_controller_spec.rb
index 551dceda3d..7c12b1fcfd 100644
--- a/spec/requests/extra_locales_controller_spec.rb
+++ b/spec/requests/extra_locales_controller_spec.rb
@@ -28,16 +28,16 @@ describe ExtraLocalesController do
       let(:moderator) { Fabricate(:moderator) }
       before { sign_in(moderator) }
 
-      it "caches for 24 hours if version is provided and it matches current hash" do
+      it "caches for 1 year if version is provided and it matches current hash" do
         get "/extra-locales/admin", params: { v: ExtraLocalesController.bundle_js_hash('admin') }
         expect(response.status).to eq(200)
-        expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
+        expect(response.headers["Cache-Control"]).to eq("max-age=31556952, public, immutable")
       end
 
       it "does not cache at all if version is invalid" do
         get "/extra-locales/admin", params: { v: 'a' * 32 }
         expect(response.status).to eq(200)
-        expect(response.headers["Cache-Control"]).not_to eq("max-age=86400, public, immutable")
+        expect(response.headers["Cache-Control"]).not_to include("max-age", "public", "immutable")
       end
 
       context "with plugin" do
@@ -67,6 +67,47 @@ describe ExtraLocalesController do
         end
       end
     end
+
+    context "overridden translations" do
+      after { I18n.reload! }
+
+      it "works for anonymous users" do
+        TranslationOverride.upsert!(I18n.locale, 'js.some_key', 'client-side translation')
+
+        get "/extra-locales/overrides", params: { v: ExtraLocalesController.bundle_js_hash('overrides') }
+        expect(response.status).to eq(200)
+        expect(response.headers["Cache-Control"]).to eq("max-age=31556952, public, immutable")
+      end
+
+      it "returns nothing when there are not overridden translations" do
+        get "/extra-locales/overrides"
+        expect(response.status).to eq(200)
+        expect(response.body).to be_empty
+      end
+
+      context "with translations" do
+        it "returns the correct translations" do
+          TranslationOverride.upsert!(I18n.locale, 'js.some_key', 'client-side translation')
+          TranslationOverride.upsert!(I18n.locale, 'js.client_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
+          TranslationOverride.upsert!(I18n.locale, 'admin_js.another_key', 'admin client js')
+          TranslationOverride.upsert!(I18n.locale, 'server.some_key', 'server-side translation')
+          TranslationOverride.upsert!(I18n.locale, 'server.some_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
+
+          get "/extra-locales/overrides"
+          expect(response.status).to eq(200)
+          expect(response.body).to_not include("server.some_key", "server.some_MF")
+
+          ctx = MiniRacer::Context.new
+          ctx.eval("I18n = {};")
+          ctx.eval(response.body)
+
+          expect(ctx.eval('typeof I18n._mfOverrides["js.client_MF"]')).to eq("function")
+          expect(ctx.eval('I18n._overrides["js.some_key"]')).to eq("client-side translation")
+          expect(ctx.eval('I18n._overrides["js.client_MF"] === undefined')).to eq(true)
+          expect(ctx.eval('I18n._overrides["admin_js.another_key"]')).to eq("admin client js")
+        end
+      end
+    end
   end
 
   describe ".bundle_js_hash" do
@@ -95,4 +136,25 @@ describe ExtraLocalesController do
       expect(ExtraLocalesController.bundle_js_hash("wizard")).to eq(expected_hash_de)
     end
   end
+
+  describe ".client_overrides_exist?" do
+    after do
+      I18n.reload!
+      ExtraLocalesController.clear_cache!
+    end
+
+    it "returns false if there are no client-side translation overrides" do
+      expect(ExtraLocalesController.client_overrides_exist?).to eq(false)
+
+      TranslationOverride.upsert!(I18n.locale, 'server.some_key', 'server-side translation')
+      expect(ExtraLocalesController.client_overrides_exist?).to eq(false)
+    end
+
+    it "returns true if there are client-side translation overrides" do
+      expect(ExtraLocalesController.client_overrides_exist?).to eq(false)
+
+      TranslationOverride.upsert!(I18n.locale, 'js.some_key', 'client-side translation')
+      expect(ExtraLocalesController.client_overrides_exist?).to eq(true)
+    end
+  end
 end
diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js.es6
index 222953482f..7182e6d8f4 100644
--- a/test/javascripts/initializers/localization-test.js.es6
+++ b/test/javascripts/initializers/localization-test.js.es6
@@ -1,9 +1,9 @@
-import PreloadStore from "preload-store";
 import LocalizationInitializer from "discourse/initializers/localization";
 
 QUnit.module("initializer:localization", {
   _locale: I18n.locale,
   _translations: I18n.translations,
+  _overrides: I18n._overrides,
 
   beforeEach() {
     I18n.locale = "fr";
@@ -31,14 +31,15 @@ QUnit.module("initializer:localization", {
   afterEach() {
     I18n.locale = this._locale;
     I18n.translations = this._translations;
+    I18n._overrides = this._overrides;
   }
 });
 
 QUnit.test("translation overrides", function(assert) {
-  PreloadStore.store("translationOverrides", {
+  I18n._overrides = {
     "js.composer.reply": "WAT",
     "js.topic.reply.help": "foobar"
-  });
+  };
   LocalizationInitializer.initialize(this.registry);
 
   assert.equal(
@@ -56,10 +57,10 @@ QUnit.test("translation overrides", function(assert) {
 QUnit.test(
   "skip translation override if parent node is not an object",
   function(assert) {
-    PreloadStore.store("translationOverrides", {
+    I18n._overrides = {
       "js.composer.reply": "WAT",
       "js.composer.reply.help": "foobar"
-    });
+    };
     LocalizationInitializer.initialize(this.registry);
 
     assert.equal(I18n.t("composer.reply.help"), "[fr.composer.reply.help]");

From edc135d9c51197997826490d38f0925d9b9eb46c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 5 Nov 2019 12:43:49 -0600
Subject: [PATCH 319/328] DEV: Import set, setProperties, helper, and string
 functions (#8297)

---
 .../admin/components/secret-value-list.js.es6 |  3 ++-
 .../admin/controllers/admin-user-index.js.es6 |  3 ++-
 .../admin/controllers/admin.js.es6            |  3 ++-
 .../modals/admin-install-theme.js.es6         |  3 ++-
 .../admin/helpers/disposition-icon.js.es6     |  3 ++-
 .../admin/helpers/post-action-title.js.es6    |  4 +++-
 .../discourse-common/lib/helpers.js.es6       |  7 ++++---
 .../discourse-common/resolver.js.es6          | 10 ++++-----
 app/assets/javascripts/discourse-loader.js    | 21 +++++++++++++++++--
 .../discourse/adapters/post.js.es6            |  3 ++-
 .../discourse/adapters/rest.js.es6            |  7 ++++---
 .../discourse/components/cdn-img.js.es6       |  3 ++-
 .../components/group-flair-inputs.js.es6      |  3 ++-
 .../discourse/components/mount-widget.js.es6  |  3 ++-
 .../components/reviewable-item.js.es6         |  6 ++++--
 .../components/user-card-contents.js.es6      |  3 ++-
 .../controllers/discovery/categories.js.es6   |  3 ++-
 .../controllers/edit-topic-timer.js.es6       |  3 ++-
 .../discourse/controllers/user.js.es6         |  3 ++-
 .../discourse/helpers/dasherize.js.es6        |  4 +++-
 .../discourse/helpers/editable-value.js.es6   |  4 +++-
 .../subscribe-user-notifications.js.es6       |  3 ++-
 .../discourse/lib/show-modal.js.es6           |  4 +++-
 .../discourse/models/composer.js.es6          |  3 ++-
 .../javascripts/discourse/models/store.js.es6 | 12 ++++++-----
 .../widgets/component-connector.js.es6        |  6 ++++--
 .../discourse/widgets/connector.js.es6        |  5 +++--
 .../components/composer-actions.js.es6        |  6 ++++--
 .../components/wizard-field-image.js.es6      |  3 ++-
 .../wizard/components/wizard-field.js.es6     |  7 ++++---
 .../wizard/components/wizard-step.js.es6      |  3 ++-
 31 files changed, 103 insertions(+), 51 deletions(-)

diff --git a/app/assets/javascripts/admin/components/secret-value-list.js.es6 b/app/assets/javascripts/admin/components/secret-value-list.js.es6
index 1822ba196a..4327f62f80 100644
--- a/app/assets/javascripts/admin/components/secret-value-list.js.es6
+++ b/app/assets/javascripts/admin/components/secret-value-list.js.es6
@@ -1,6 +1,7 @@
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import { on } from "ember-addons/ember-computed-decorators";
+import { set } from "@ember/object";
 
 export default Component.extend({
   classNameBindings: [":value-list", ":secret-value-list"],
@@ -67,7 +68,7 @@ export default Component.extend({
 
   _replaceValue(index, newValue, keyName) {
     let item = this.collection[index];
-    Ember.set(item, keyName, newValue);
+    set(item, keyName, newValue);
 
     this._saveValues();
   },
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 47a54b8ebf..de2e37668f 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -8,6 +8,7 @@ import { userPath } from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
+import { htmlSafe } from "@ember/template";
 
 export default Controller.extend(CanCheckEmails, {
   adminTools: service(),
@@ -47,7 +48,7 @@ export default Controller.extend(CanCheckEmails, {
   automaticGroups(automaticGroups) {
     return automaticGroups
       .map(group => {
-        const name = Ember.String.htmlSafe(group.name);
+        const name = htmlSafe(group.name);
         return `<a href="/g/${name}">${name}</a>`;
       })
       .join(", ");
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index c615169380..f01a898b0c 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,6 +1,7 @@
 import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
+import { dasherize } from "@ember/string";
 
 export default Controller.extend({
   router: service(),
@@ -27,7 +28,7 @@ export default Controller.extend({
           segment !== "admin"
         );
       })
-      .map(Ember.String.dasherize)
+      .map(dasherize)
       .join(" ");
 
     // this is done to avoid breaking css customizations
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 949353de7d..81055d733d 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
@@ -10,6 +10,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import { THEMES, COMPONENTS } from "admin/models/theme";
 import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
+import { set } from "@ember/object";
 
 const MIN_NAME_LENGTH = 4;
 
@@ -46,7 +47,7 @@ export default Controller.extend(ModalFunctionality, {
   themes(installedThemes) {
     return POPULAR_THEMES.map(t => {
       if (installedThemes.includes(t.name)) {
-        Ember.set(t, "installed", true);
+        set(t, "installed", true);
       }
       return t;
     });
diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
index 2a2440a294..0e1ea29a27 100644
--- a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
+++ b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
@@ -1,6 +1,7 @@
 import { iconHTML } from "discourse-common/lib/icon-library";
+import Helper from "@ember/component/helper";
 
-export default Ember.Helper.extend({
+export default Helper.extend({
   compute([disposition]) {
     if (!disposition) {
       return null;
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
index 5ce437bf4a..657aee2e9b 100644
--- a/app/assets/javascripts/admin/helpers/post-action-title.js.es6
+++ b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
@@ -1,3 +1,5 @@
+import Helper from "@ember/component/helper";
+
 function postActionTitle([id, nameKey]) {
   let title = I18n.t(`admin.flags.short_names.${nameKey}`, {
     defaultValue: null
@@ -11,4 +13,4 @@ function postActionTitle([id, nameKey]) {
   return title;
 }
 
-export default Ember.Helper.helper(postActionTitle);
+export default Helper.helper(postActionTitle);
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 17bdee941d..5b7d4fdc81 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -1,4 +1,5 @@
 import { get } from "@ember/object";
+import Helper from "@ember/component/helper";
 
 export function makeArray(obj) {
   if (obj === null || obj === undefined) {
@@ -8,7 +9,7 @@ export function makeArray(obj) {
 }
 
 export function htmlHelper(fn) {
-  return Ember.Helper.helper(function(...args) {
+  return Helper.helper(function(...args) {
     args =
       args.length > 1 ? args[0].concat({ hash: args[args.length - 1] }) : args;
     return new Handlebars.SafeString(fn.apply(this, args) || "");
@@ -29,7 +30,7 @@ function rawGet(ctx, property, options) {
 }
 
 export function registerHelper(name, fn) {
-  _helpers[name] = Ember.Helper.helper(fn);
+  _helpers[name] = Helper.helper(fn);
 }
 
 export function findHelper(name) {
@@ -84,7 +85,7 @@ export function registerUnbound(name, fn) {
     return fn.call(this, ...properties, resolveParams(this, options));
   };
 
-  _helpers[name] = Ember.Helper.extend({
+  _helpers[name] = Helper.extend({
     compute: (params, args) => fn(...params, args)
   });
   Handlebars.registerHelper(name, func);
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index e03a9d7ed7..e1507406bb 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -1,9 +1,7 @@
 import { findHelper } from "discourse-common/lib/helpers";
 import { get } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
-
-/* global requirejs, require */
-var classify = Ember.String.classify;
+import { classify, dasherize } from "@ember/string";
 
 const _options = {};
 
@@ -63,7 +61,7 @@ export function buildResolver(baseName) {
         split[1] = split[1].replace(".templates", "").replace("/templates", "");
 
         // Try slashes
-        let dashed = Ember.String.dasherize(split[1].replace(/\./g, "/"));
+        let dashed = dasherize(split[1].replace(/\./g, "/"));
         if (
           requirejs.entries[appBase + dashed] ||
           requirejs.entries[adminBase + dashed]
@@ -72,7 +70,7 @@ export function buildResolver(baseName) {
         }
 
         // Try with dashes instead of slashes
-        dashed = Ember.String.dasherize(split[1].replace(/\./g, "-"));
+        dashed = dasherize(split[1].replace(/\./g, "-"));
         if (
           requirejs.entries[appBase + dashed] ||
           requirejs.entries[adminBase + dashed]
@@ -86,7 +84,7 @@ export function buildResolver(baseName) {
     customResolve(parsedName) {
       // If we end with the name we want, use it. This allows us to define components within plugins.
       const suffix = parsedName.type + "s/" + parsedName.fullNameWithoutType,
-        dashed = Ember.String.dasherize(suffix),
+        dashed = dasherize(suffix),
         moduleName = Object.keys(requirejs.entries).find(function(e) {
           return (
             e.indexOf(suffix, e.length - suffix.length) !== -1 ||
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 21034aa75a..5052771e91 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -14,7 +14,9 @@ var define, requirejs;
       "@ember/object": {
         default: Ember.Object,
         get: Ember.get,
-        getProperties: Ember.getProperties
+        getProperties: Ember.getProperties,
+        set: Ember.set,
+        setProperties: Ember.setProperties
       },
       "@ember/object/computed": {
         default: Ember.computed,
@@ -78,8 +80,23 @@ var define, requirejs;
         Promise: Ember.RSVP.Promise,
         hash: Ember.RSVP.hash,
         all: Ember.RSVP.all
+      },
+      "@ember/string": {
+        dasherize: Ember.String.dasherize,
+        classify: Ember.String.classify,
+        underscore: Ember.String.underscore,
+        camelize: Ember.String.camelize
+      },
+      "@ember/template": {
+        htmlSafe: Ember.String.htmlSafe
+      },
+      "@ember/application": {
+        setOwner: Ember.setOwner,
+        getOwner: Ember.getOwner
+      },
+      "@ember/component/helper": {
+        default: Ember.Helper
       }
-
     };
   }
 
diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js.es6
index 5c3268daaa..950198067e 100644
--- a/app/assets/javascripts/discourse/adapters/post.js.es6
+++ b/app/assets/javascripts/discourse/adapters/post.js.es6
@@ -1,6 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
 import RestAdapter from "discourse/adapters/rest";
 import { Result } from "discourse/adapters/rest";
+import { underscore } from "@ember/string";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
@@ -10,7 +11,7 @@ export default RestAdapter.extend({
   },
 
   createRecord(store, type, args) {
-    const typeField = Ember.String.underscore(type);
+    const typeField = underscore(type);
     args.nested_post = true;
     return ajax(this.pathFor(store, type), { method: "POST", data: args }).then(
       function(json) {
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index 5ace5dc40b..bc2839985f 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -1,6 +1,7 @@
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { hashString } from "discourse/lib/hash";
+import { underscore } from "@ember/string";
 
 const ADMIN_MODELS = [
   "plugin",
@@ -66,7 +67,7 @@ export default EmberObject.extend({
   pathFor(store, type, findArgs) {
     let path =
       this.basePath(store, type, findArgs) +
-      Ember.String.underscore(store.pluralize(this.apiNameFor(type)));
+      underscore(store.pluralize(this.apiNameFor(type)));
     return this.appendQueryParams(path, findArgs);
   },
 
@@ -108,7 +109,7 @@ export default EmberObject.extend({
 
   update(store, type, id, attrs) {
     const data = {};
-    const typeField = Ember.String.underscore(this.apiNameFor(type));
+    const typeField = underscore(this.apiNameFor(type));
     data[typeField] = attrs;
 
     return ajax(
@@ -121,7 +122,7 @@ export default EmberObject.extend({
 
   createRecord(store, type, attrs) {
     const data = {};
-    const typeField = Ember.String.underscore(this.apiNameFor(type));
+    const typeField = underscore(this.apiNameFor(type));
     data[typeField] = attrs;
     return ajax(this.pathFor(store, type), this.getPayload("POST", data)).then(
       function(json) {
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js.es6
index 5b261e5640..338c71a1ee 100644
--- a/app/assets/javascripts/discourse/components/cdn-img.js.es6
+++ b/app/assets/javascripts/discourse/components/cdn-img.js.es6
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
+import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
   tagName: "",
@@ -12,7 +13,7 @@ export default Component.extend({
   @computed("width", "height")
   style(width, height) {
     if (width && height) {
-      return Ember.String.htmlSafe(`--aspect-ratio: ${width / height};`);
+      return htmlSafe(`--aspect-ratio: ${width / height};`);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index a190ffda1d..7b2b7110a0 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -5,6 +5,7 @@ import { observes } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 import { convertIconClass } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
+import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
   classNames: ["group-flair-inputs"],
@@ -77,7 +78,7 @@ export default Component.extend({
 
     if (flairHexColor) style += `color: #${flairHexColor};`;
 
-    return Ember.String.htmlSafe(style);
+    return htmlSafe(style);
   },
 
   @computed("model.flairBackgroundHexColor")
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 1363750b81..e62b7acab3 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -6,6 +6,7 @@ import { WidgetClickHook } from "discourse/widgets/hooks";
 import { queryRegistry } from "discourse/widgets/widget";
 import { getRegister } from "discourse-common/lib/get-owner";
 import DirtyKeys from "discourse/lib/dirty-keys";
+import { camelize } from "@ember/string";
 
 let _cleanCallbacks = {};
 export function addWidgetCleanCallback(widgetName, fn) {
@@ -80,7 +81,7 @@ export default Component.extend({
   afterPatch() {},
 
   eventDispatched(eventName, key, refreshArg) {
-    const onRefresh = Ember.String.camelize(eventName.replace(/:/, "-"));
+    const onRefresh = camelize(eventName.replace(/:/, "-"));
     this.dirtyKeys.keyDirty(key, { onRefresh, refreshArg });
     this.queueRerender();
   },
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
index 23f3b53479..c5aaba8b7b 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
@@ -5,6 +5,8 @@ import computed from "ember-addons/ember-computed-decorators";
 import Category from "discourse/models/category";
 import optionalService from "discourse/lib/optional-service";
 import showModal from "discourse/lib/show-modal";
+import { dasherize } from "@ember/string";
+import { set } from "@ember/object";
 
 let _components = {};
 
@@ -65,7 +67,7 @@ export default Component.extend({
       return _components[type];
     }
 
-    let dasherized = Ember.String.dasherize(type);
+    let dasherized = dasherize(type);
     let templatePath = `components/${dasherized}`;
     let template =
       Ember.TEMPLATES[`${templatePath}`] ||
@@ -185,7 +187,7 @@ export default Component.extend({
     },
 
     valueChanged(fieldId, event) {
-      Ember.set(this._updates, fieldId, event.target.value);
+      set(this._updates, fieldId, event.target.value);
     },
 
     perform(action) {
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 1416d39bc4..d7c6eac785 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -13,6 +13,7 @@ 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";
 
 export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   elementId: "user-card",
@@ -76,7 +77,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
         .filterBy("show_on_user_card", true)
         .sortBy("position")
         .map(field => {
-          Ember.set(field, "dasherized_name", field.get("name").dasherize());
+          set(field, "dasherized_name", field.get("name").dasherize());
           const value = userFields ? userFields[field.get("id")] : null;
           return isEmpty(value) ? null : EmberObject.create({ value, field });
         })
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index 66532a9952..81542214ef 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -2,6 +2,7 @@ import { reads } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscoveryController from "discourse/controllers/discovery";
+import { dasherize } from "@ember/string";
 
 const subcategoryStyleComponentNames = {
   rows: "categories_only",
@@ -44,7 +45,7 @@ export default DiscoveryController.extend({
       parentCategory && style === "categories_and_latest_topics"
         ? "categories_only"
         : style;
-    return Ember.String.dasherize(componentName);
+    return dasherize(componentName);
   },
   actions: {
     refresh() {
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 88a9109d02..7dc26c632c 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -4,6 +4,7 @@ import { default as computed } from "ember-addons/ember-computed-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";
@@ -78,7 +79,7 @@ export default Controller.extend(ModalFunctionality, {
         if (time) {
           this.send("closeModal");
 
-          Ember.setProperties(this.topicTimer, {
+          setProperties(this.topicTimer, {
             execute_at: result.execute_at,
             duration: result.duration,
             category_id: result.category_id
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index ac48062e8c..e24bf67a68 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -9,6 +9,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import User from "discourse/models/user";
 import optionalService from "discourse/lib/optional-service";
 import { prioritizeNameInUx } from "discourse/lib/settings";
+import { set } from "@ember/object";
 
 export default Controller.extend(CanCheckEmails, {
   indexStream: false,
@@ -115,7 +116,7 @@ export default Controller.extend(CanCheckEmails, {
         .filterBy("show_on_profile", true)
         .sortBy("position")
         .map(field => {
-          Ember.set(field, "dasherized_name", field.get("name").dasherize());
+          set(field, "dasherized_name", field.get("name").dasherize());
           const value = userFields
             ? userFields[field.get("id").toString()]
             : null;
diff --git a/app/assets/javascripts/discourse/helpers/dasherize.js.es6 b/app/assets/javascripts/discourse/helpers/dasherize.js.es6
index b824006169..ce9aaed3af 100644
--- a/app/assets/javascripts/discourse/helpers/dasherize.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dasherize.js.es6
@@ -1,5 +1,7 @@
+import Helper from "@ember/component/helper";
+
 function dasherize([value]) {
   return (value || "").replace(".", "-").dasherize();
 }
 
-export default Ember.Helper.helper(dasherize);
+export default Helper.helper(dasherize);
diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js.es6 b/app/assets/javascripts/discourse/helpers/editable-value.js.es6
index 131973c0b3..ae67cedf5e 100644
--- a/app/assets/javascripts/discourse/helpers/editable-value.js.es6
+++ b/app/assets/javascripts/discourse/helpers/editable-value.js.es6
@@ -1,4 +1,6 @@
 import { get } from "@ember/object";
+import Helper from "@ember/component/helper";
+
 export function formatCurrency([reviewable, fieldId]) {
   // The field `category_id` corresponds to `category`
   if (fieldId === "category_id") {
@@ -15,4 +17,4 @@ export function formatCurrency([reviewable, fieldId]) {
   return value;
 }
 
-export default Ember.Helper.helper(formatCurrency);
+export default Helper.helper(formatCurrency);
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 2de97db037..c79a94ceaf 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -11,6 +11,7 @@ import {
   unsubscribe as unsubscribePushNotifications,
   isPushNotificationsEnabled
 } from "discourse/lib/push-notifications";
+import { set } from "@ember/object";
 
 export default {
   name: "subscribe-user-notifications",
@@ -120,7 +121,7 @@ export default {
       });
 
       bus.subscribe("/client_settings", data =>
-        Ember.set(siteSettings, data.name, data.value)
+        set(siteSettings, data.name, data.value)
       );
       bus.subscribe("/refresh_client", data =>
         Discourse.set("assetVersion", data)
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 8cf5a2b0be..968f1e399d 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -1,3 +1,5 @@
+import { dasherize } from "@ember/string";
+
 export default function(name, opts) {
   opts = opts || {};
   const container = Discourse.__container__;
@@ -13,7 +15,7 @@ export default function(name, opts) {
   modalController.set("name", controllerName);
 
   let controller = container.lookup("controller:" + controllerName);
-  const templateName = opts.templateName || Ember.String.dasherize(name);
+  const templateName = opts.templateName || dasherize(name);
 
   const renderArgs = { into: "modal", outlet: "modalBody" };
   if (controller) {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 3648107d6f..8e3a1af259 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -18,6 +18,7 @@ import { escapeExpression, tinyAvatar } from "discourse/lib/utilities";
 import { propertyNotEqual } from "discourse/lib/computed";
 import throttle from "discourse/lib/throttle";
 import { Promise } from "rsvp";
+import { set } from "@ember/object";
 
 // The actions the composer can take
 export const CREATE_TOPIC = "createTopic",
@@ -859,7 +860,7 @@ const Composer = RestModel.extend({
     Object.keys(serializer).forEach(f => {
       const val = this.get(serializer[f]);
       if (typeof val !== "undefined") {
-        Ember.set(dest, f, val);
+        set(dest, f, val);
       }
     });
     return dest;
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 3160fff6f5..3f5116e611 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -3,6 +3,8 @@ 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";
 
 let _identityMap;
 
@@ -96,7 +98,7 @@ export default EmberObject.extend({
       const apiName = this.adapterFor(type).apiNameFor(type);
       return this._hydrate(
         type,
-        result[Ember.String.underscore(apiName)],
+        result[underscore(apiName)],
         result
       );
     }
@@ -154,7 +156,7 @@ export default EmberObject.extend({
   refreshResults(resultSet, type, url) {
     const adapter = this.adapterFor(type);
     return ajax(url).then(result => {
-      const typeName = Ember.String.underscore(
+      const typeName = underscore(
         this.pluralize(adapter.apiNameFor(type))
       );
       const content = result[typeName].map(obj =>
@@ -167,7 +169,7 @@ export default EmberObject.extend({
   appendResults(resultSet, type, url) {
     const adapter = this.adapterFor(type);
     return ajax(url).then(result => {
-      const typeName = Ember.String.underscore(
+      const typeName = underscore(
         this.pluralize(adapter.apiNameFor(type))
       );
 
@@ -223,7 +225,7 @@ export default EmberObject.extend({
 
   _resultSet(type, result, findArgs) {
     const adapter = this.adapterFor(type);
-    const typeName = Ember.String.underscore(
+    const typeName = underscore(
       this.pluralize(adapter.apiNameFor(type))
     );
     const content = result[typeName].map(obj =>
@@ -327,7 +329,7 @@ export default EmberObject.extend({
             obj[subType] = hydrated;
             delete obj[k];
           } else {
-            Ember.set(obj, subType, null);
+            set(obj, subType, null);
           }
         }
       }
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index 44eabe7c03..d5d9213cf2 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -1,4 +1,6 @@
 import { next } from "@ember/runloop";
+import { setOwner, getOwner } from '@ember/application';
+
 export default class ComponentConnector {
   constructor(widget, componentName, opts, trackedProperties) {
     this.widget = widget;
@@ -27,8 +29,8 @@ export default class ComponentConnector {
         view._compute();
       }
 
-      if (Ember.setOwner) {
-        Ember.setOwner(view, Ember.getOwner(mounted));
+      if (setOwner) {
+        setOwner(view, getOwner(mounted));
       }
 
       mounted._connected.push(view);
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index d5d1c98f3d..e3c0d9b628 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -1,5 +1,6 @@
 import { next } from "@ember/runloop";
 import deprecated from "discourse-common/lib/deprecated";
+import { setOwner, getOwner } from "@ember/application";
 
 export default class Connector {
   constructor(widget, opts) {
@@ -52,8 +53,8 @@ export default class Connector {
       }
 
       if (view) {
-        if (Ember.setOwner) {
-          Ember.setOwner(view, Ember.getOwner(mounted));
+        if (setOwner) {
+          setOwner(view, getOwner(mounted));
         }
         mounted._connected.push(view);
         view.renderer.appendTo(view, $elem[0]);
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
index 328fad5da9..98b1d06410 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -7,6 +7,8 @@ import {
   REPLY,
   EDIT
 } from "discourse/models/composer";
+import { camelize } from "@ember/string";
+import { empty } from "@ember/object/computed";
 
 // Component can get destroyed and lose state
 let _topicSnapshot = null;
@@ -26,7 +28,7 @@ export default DropdownSelectBoxComponent.extend({
   allowInitialValueMutation: false,
   allowAutoSelectFirst: false,
   showFullTitle: false,
-  isHidden: Ember.computed.empty("content"),
+  isHidden: empty("content"),
 
   didReceiveAttrs() {
     this._super(...arguments);
@@ -292,7 +294,7 @@ export default DropdownSelectBoxComponent.extend({
 
   actions: {
     onSelect(value) {
-      let action = `${Ember.String.camelize(value)}Selected`;
+      let action = `${camelize(value)}Selected`;
       if (this[action]) {
         let model = this.composerModel;
         this[action](
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
index f2022c3ec7..a407bd5046 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
@@ -3,6 +3,7 @@ import getUrl from "discourse-common/lib/get-url";
 import computed from "ember-addons/ember-computed-decorators";
 import { getToken } from "wizard/lib/ajax";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { dasherize } from "@ember/string";
 
 export default Component.extend({
   classNames: ["wizard-image-row"],
@@ -10,7 +11,7 @@ export default Component.extend({
 
   @computed("field.id")
   previewComponent(id) {
-    const componentName = `image-preview-${Ember.String.dasherize(id)}`;
+    const componentName = `image-preview-${dasherize(id)}`;
     const exists = getOwner(this).lookup(`component:${componentName}`);
     return exists ? componentName : "wizard-image-preview";
   },
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js.es6
index f3f7e80523..b0b9d889c9 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field.js.es6
@@ -1,19 +1,20 @@
 import Component from "@ember/component";
 import computed from "ember-addons/ember-computed-decorators";
+import { dasherize } from "@ember/string";
 
 export default Component.extend({
   classNameBindings: [":wizard-field", "typeClass", "field.invalid"],
 
   @computed("field.type")
-  typeClass: type => `${Ember.String.dasherize(type)}-field`,
+  typeClass: type => `${dasherize(type)}-field`,
 
   @computed("field.id")
-  fieldClass: id => `field-${Ember.String.dasherize(id)} wizard-focusable`,
+  fieldClass: id => `field-${dasherize(id)} wizard-focusable`,
 
   @computed("field.type", "field.id")
   inputComponentName(type, id) {
     return type === "component"
-      ? Ember.String.dasherize(id)
+      ? dasherize(id)
       : `wizard-field-${type}`;
   }
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index 1d034d1c47..a1a3372473 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -5,6 +5,7 @@ import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
+import { htmlSafe } from "@ember/template";
 
 jQuery.fn.wiggle = function(times, duration) {
   if (times > 0) {
@@ -89,7 +90,7 @@ export default Component.extend({
       ratio = 1;
     }
 
-    return Ember.String.htmlSafe(`width: ${ratio * 200}px`);
+    return htmlSafe(`width: ${ratio * 200}px`);
   },
 
   autoFocus() {

From ca14e3d83c7901c49539fbbe7aa85df1b50926e0 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 5 Nov 2019 13:32:43 -0600
Subject: [PATCH 320/328] FIX: Build with prettier for imports (#8298)

---
 .../javascripts/discourse/models/store.js.es6  | 18 ++++--------------
 .../widgets/component-connector.js.es6         |  2 +-
 .../wizard/components/wizard-field.js.es6      |  4 +---
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 3f5116e611..39a5ce1434 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -96,11 +96,7 @@ export default EmberObject.extend({
       return this._resultSet(type, result, findArgs);
     } else {
       const apiName = this.adapterFor(type).apiNameFor(type);
-      return this._hydrate(
-        type,
-        result[underscore(apiName)],
-        result
-      );
+      return this._hydrate(type, result[underscore(apiName)], result);
     }
   },
 
@@ -156,9 +152,7 @@ export default EmberObject.extend({
   refreshResults(resultSet, type, url) {
     const adapter = this.adapterFor(type);
     return ajax(url).then(result => {
-      const typeName = underscore(
-        this.pluralize(adapter.apiNameFor(type))
-      );
+      const typeName = underscore(this.pluralize(adapter.apiNameFor(type)));
       const content = result[typeName].map(obj =>
         this._hydrate(type, obj, result)
       );
@@ -169,9 +163,7 @@ export default EmberObject.extend({
   appendResults(resultSet, type, url) {
     const adapter = this.adapterFor(type);
     return ajax(url).then(result => {
-      const typeName = underscore(
-        this.pluralize(adapter.apiNameFor(type))
-      );
+      const typeName = underscore(this.pluralize(adapter.apiNameFor(type)));
 
       let pageTarget = result.meta || result;
       let totalRows =
@@ -225,9 +217,7 @@ export default EmberObject.extend({
 
   _resultSet(type, result, findArgs) {
     const adapter = this.adapterFor(type);
-    const typeName = underscore(
-      this.pluralize(adapter.apiNameFor(type))
-    );
+    const typeName = underscore(this.pluralize(adapter.apiNameFor(type)));
     const content = result[typeName].map(obj =>
       this._hydrate(type, obj, result)
     );
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index d5d9213cf2..db53cc314f 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -1,5 +1,5 @@
 import { next } from "@ember/runloop";
-import { setOwner, getOwner } from '@ember/application';
+import { setOwner, getOwner } from "@ember/application";
 
 export default class ComponentConnector {
   constructor(widget, componentName, opts, trackedProperties) {
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js.es6
index b0b9d889c9..7636eee0d0 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field.js.es6
@@ -13,8 +13,6 @@ export default Component.extend({
 
   @computed("field.type", "field.id")
   inputComponentName(type, id) {
-    return type === "component"
-      ? dasherize(id)
-      : `wizard-field-${type}`;
+    return type === "component" ? dasherize(id) : `wizard-field-${type}`;
   }
 });

From 59241df25179023089d506b84e7f647452a4521e Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 5 Nov 2019 20:06:47 +0000
Subject: [PATCH 321/328] FIX: Display tags topic list correctly when none is
 selected for subcategories

---
 .../discourse/pre-initializers/dynamic-route-builders.js.es6 | 4 ++++
 app/assets/javascripts/discourse/routes/app-route-map.js.es6 | 4 ++++
 app/assets/javascripts/discourse/routes/tags-show.js.es6     | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

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.es6
index a8de4fc07d..ecb018fe65 100644
--- a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
@@ -95,6 +95,7 @@ export default {
     });
 
     app["TagsShowCategoryRoute"] = TagsShowRoute.extend();
+    app["TagsShowCategoryNoneRoute"] = TagsShowRoute.extend({ noSubcategories: true });
     app["TagsShowParentCategoryRoute"] = TagsShowRoute.extend();
 
     site.get("filters").forEach(function(filter) {
@@ -104,6 +105,9 @@ export default {
       app[
         "TagsShowCategory" + filter.capitalize() + "Route"
       ] = TagsShowRoute.extend({ navMode: filter });
+      app[
+        "TagsShowNoneCategory" + filter.capitalize() + "Route"
+      ] = TagsShowRoute.extend({ navMode: filter, noSubcategories: true });
       app[
         "TagsShowParentCategory" + filter.capitalize() + "Route"
       ] = TagsShowRoute.extend({ navMode: filter });
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 2bc476425c..1da84b4047 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -199,6 +199,7 @@ export default function() {
   this.route("tags", { resetNamespace: true }, function() {
     this.route("show", { path: "/:tag_id" });
     this.route("showCategory", { path: "/c/:category/:tag_id" });
+    this.route("showCategoryNone", { path: "/c/:category/none/:tag_id" });
     this.route("showParentCategory", {
       path: "/c/:parent_category/:category/:tag_id"
     });
@@ -210,6 +211,9 @@ export default function() {
       this.route("showCategory" + filter.capitalize(), {
         path: "/c/:category/:tag_id/l/" + filter
       });
+      this.route("showCategoryNone" + filter.capitalize(), {
+        path: "/c/:category/:tag_id/l/" + filter
+      });
       this.route("showParentCategory" + filter.capitalize(), {
         path: "/c/:parent_category/:category/:tag_id/l/" + filter
       });
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index 7bf26e26a9..c718cc75ff 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -85,6 +85,8 @@ export default DiscourseRoute.extend({
       );
       if (parentCategorySlug) {
         filter = `tags/c/${parentCategorySlug}/${categorySlug}/${tagId}/l/${topicFilter}`;
+      } else if (this.noSubcategories) {
+        filter = `tags/c/${categorySlug}/none/${tagId}/l/${topicFilter}`;
       } else {
         filter = `tags/c/${categorySlug}/${tagId}/l/${topicFilter}`;
       }
@@ -162,7 +164,8 @@ export default DiscourseRoute.extend({
       category: this.category,
       filterMode: this.filterMode,
       navMode: this.navMode,
-      tagNotification: this.tagNotification
+      tagNotification: this.tagNotification,
+      noSubcategories: this.noSubcategories
     });
   },
 

From e3b7f0791648043a9d4278fbcd26cc14f2dc41b3 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 5 Nov 2019 22:30:23 +0000
Subject: [PATCH 322/328] DEV: Run prettier

---
 .../discourse/pre-initializers/dynamic-route-builders.js.es6  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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.es6
index ecb018fe65..55f4fee1d9 100644
--- a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
@@ -95,7 +95,9 @@ export default {
     });
 
     app["TagsShowCategoryRoute"] = TagsShowRoute.extend();
-    app["TagsShowCategoryNoneRoute"] = TagsShowRoute.extend({ noSubcategories: true });
+    app["TagsShowCategoryNoneRoute"] = TagsShowRoute.extend({
+      noSubcategories: true
+    });
     app["TagsShowParentCategoryRoute"] = TagsShowRoute.extend();
 
     site.get("filters").forEach(function(filter) {

From 5ad0dd0c2349a7ff0537d5b74a692b8c3c67ab21 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 6 Nov 2019 17:05:33 +1100
Subject: [PATCH 323/328] FIX: tweak restorer spec to make it stableish (#8300)

---
 spec/lib/backup_restore/restorer_spec.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
index fb13bcafd6..2990be9052 100644
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ b/spec/lib/backup_restore/restorer_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 # Causes flakiness
-xdescribe BackupRestore::Restorer do
+describe BackupRestore::Restorer do
   it 'detects which pg_dump output is restorable to different schemas' do
     {
       "9.6.7" => true,
@@ -106,22 +106,21 @@ xdescribe BackupRestore::Restorer do
     let!(:admin) { Fabricate(:admin) }
     before do
       SiteSetting.allow_restore = true
-      @restore_path = File.join(Rails.root, 'public', 'backups', RailsMultisite::ConnectionManagement.current_db)
       described_class.any_instance.stubs(ensure_we_have_a_filename: true)
       described_class.any_instance.stubs(initialize_state: true)
     end
+
     after do
-      ActiveRecord::Base.clear_all_connections!
-      Rails.configuration.multisite = false
-      RailsMultisite::ConnectionManagement.clear_settings!
-      ActiveRecord::Base.establish_connection
+      SiteSetting.allow_restore = false
+      described_class.any_instance.unstub(:ensure_we_have_a_filename)
+      described_class.any_instance.unstub(:initialize_state)
     end
+
     let(:conn) { RailsMultisite::ConnectionManagement }
     let(:restorer) { described_class.new(admin.id) }
 
-    it 'correctly reconnects to database' do
+    it 'correctly reconnects to database', type: :multisite do
       restorer.instance_variable_set(:@current_db, 'second')
-      conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
       conn.establish_connection(db: 'second')
       expect(RailsMultisite::ConnectionManagement.current_db).to eq('second')
       ActiveRecord::Base.connection_pool.spec.config[:db_key] = "incorrect_db"
@@ -129,7 +128,7 @@ xdescribe BackupRestore::Restorer do
       expect(RailsMultisite::ConnectionManagement.current_db).to eq('second')
     end
 
-    it 'it is not erroring for non multisite' do
+    it 'it is not erroring for non multisite', type: :multisite do
       RailsMultisite::ConnectionManagement::clear_settings!
       expect { restorer.send(:reconnect_database) }.not_to raise_error
     end

From b869ef8a7648a677adc19ecb720869ce0fafa041 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 6 Nov 2019 15:26:46 +0530
Subject: [PATCH 324/328] FIX: add <img> alt attribute for Summary emails

---
 app/views/user_notifications/digest.html.erb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index fc187f6d48..ed0a0e3edd 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -125,7 +125,7 @@
   <tbody>
     <tr>
       <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;">
-        <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center">
+        <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center" alt="<%= t.user.username -%>">
       </td>
       <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;">
         <% if t.user %>
@@ -137,7 +137,7 @@
       </td>
       <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
         <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;" align="right">
-          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-decoration:none;">
+          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-decoration:none;" alt="topic image">
         </td>
       <%- end -%>
     </tr>
@@ -160,17 +160,17 @@
   <tbody>
     <tr>
       <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;white-space:nowrap;vertical-align:top;width:75px">
-        <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto" alt="likes">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
       </td>
       <td class="digest-topic-stat" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;width:75px">
-        <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto" alt="replies">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
       <td class="digest-topic-posters" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;">
         <% t.posters_summary.each do |ps| %>
           <% if ps.user %>
-            <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;">
+            <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;" alt="<%= ps.user.username -%>">
           <% end %>
         <% end %>
       </td>
@@ -243,7 +243,7 @@
   <tbody>
     <tr>
       <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;">
-        <img src="<%= email_image_url 'right_triangle.png' -%>" style="clear:both;display:block;height:20px;width:20px;outline:0;text-decoration:none;">
+        <img src="<%= email_image_url 'right_triangle.png' -%>" style="clear:both;display:block;height:20px;width:20px;outline:0;text-decoration:none;" alt="">
       </td>
     </tr>
   </tbody>
@@ -253,7 +253,7 @@
   <tbody>
     <tr>
       <td style="padding:0 8px 8px 8px;width:50px;vertical-align:top;">
-        <img src="<%= post.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;height:50px;width:50px;outline:0;">
+        <img src="<%= post.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;height:50px;width:50px;outline:0;" alt="<%= post.user.username -%>">
       </td>
       <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;">
         <% if post.user %>
@@ -323,16 +323,16 @@
       <td class="digest-new-topic-posters with-dir" style="padding:8px;">
         <% t.posters_summary[0,2].each do |ps| %>
           <% if ps.user %>
-            <img src="<%= ps.user.small_avatar_url -%>" style="height:20px;width:20px;margin:<%= rtl? ? '0 0 5px 5px' : '0 5px 5px 0' %>;border-radius:50%;clear:both;display:inline-block;outline:0;text-decoration:none;">
+            <img src="<%= ps.user.small_avatar_url -%>" style="height:20px;width:20px;margin:<%= rtl? ? '0 0 5px 5px' : '0 5px 5px 0' %>;border-radius:50%;clear:both;display:inline-block;outline:0;text-decoration:none;" alt="<%= ps.user.username -%>">
           <% end %>
         <% end %>
       </td>
       <td class="digest-new-topic-stat with-dir" style="padding:8px;">
-        <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto" alt="likes">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
       </td>
       <td class="digest-new-topic-stat digest-replies with-dir" style="padding:8px;">
-        <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto" alt="replies">
         <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
     </tr>

From 0dfc5947843eb126eeb05a7ecec531665e4b4bb1 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 6 Nov 2019 10:32:15 -0500
Subject: [PATCH 325/328] FIX: skip invalid URLs when checking for audio/video
 in search blurbs

Fixes 500 errors on search queries introduced in 580a4a8
---
 lib/search/grouped_search_results.rb | 14 ++++++++------
 spec/lib/search_spec.rb              |  9 ++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 88538f02ed..f523901887 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -78,13 +78,15 @@ class Search
 
       urls = Set.new
       cooked.scan(URI.regexp(%w{http https})) { urls << $& }
-
       urls.each do |url|
-        case File.extname(URI(url).path || "")
-        when Oneboxer::VIDEO_REGEX
-          cooked.gsub!(url, I18n.t("search.video"))
-        when Oneboxer::AUDIO_REGEX
-          cooked.gsub!(url, I18n.t("search.audio"))
+        begin
+          case File.extname(URI(url).path || "")
+          when Oneboxer::VIDEO_REGEX
+            cooked.gsub!(url, I18n.t("search.video"))
+          when Oneboxer::AUDIO_REGEX
+            cooked.gsub!(url, I18n.t("search.audio"))
+          end
+        rescue URI::InvalidURIError
         end
       end
 
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index c3aaa88130..7b81e27306 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -28,7 +28,7 @@ describe Search do
       expect(result).to eq("link to an external page: https://google.com/?u=bar link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")}")
     end
 
-    it "strips URLs correctly when blurb is" do
+    it "strips URLs correctly when blurb is longer than limit" do
       cooked = <<~RAW
         Here goes a test cooked with enough characters to hit the blurb limit.
 
@@ -41,6 +41,13 @@ describe Search do
       expect(result).to eq("Here goes a test cooked with enough characters to hit the blurb limit. Something is very interesting about this audio file. #{I18n.t("search.audio")}")
     end
 
+    it "does not fail on bad URLs" do
+      cooked = <<~RAW
+        invalid URL: http:error] should not trip up blurb generation.
+      RAW
+      result = Search::GroupedSearchResults.blurb_for(cooked)
+      expect(result).to eq("invalid URL: http:error] should not trip up blurb generation.")
+    end
   end
 
 end

From b151963f189137c0f4297ed8b724b8a538445278 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 6 Nov 2019 10:43:13 -0500
Subject: [PATCH 326/328] Update translations

---
 config/locales/client.ar.yml                  |  9 +--
 config/locales/client.be.yml                  |  8 +--
 config/locales/client.bg.yml                  |  9 +--
 config/locales/client.bs_BA.yml               |  9 +--
 config/locales/client.ca.yml                  | 18 +++--
 config/locales/client.cs.yml                  |  9 +--
 config/locales/client.da.yml                  |  9 +--
 config/locales/client.de.yml                  | 10 ++-
 config/locales/client.el.yml                  |  9 +--
 config/locales/client.es.yml                  | 12 ++--
 config/locales/client.et.yml                  |  9 +--
 config/locales/client.fa_IR.yml               |  9 +--
 config/locales/client.fi.yml                  |  9 +--
 config/locales/client.fr.yml                  | 13 ++--
 config/locales/client.gl.yml                  |  9 +--
 config/locales/client.he.yml                  | 29 ++++++--
 config/locales/client.hu.yml                  |  9 +--
 config/locales/client.hy.yml                  | 10 ++-
 config/locales/client.id.yml                  |  1 +
 config/locales/client.it.yml                  | 72 +++++++++++++++++--
 config/locales/client.ja.yml                  |  8 +--
 config/locales/client.ko.yml                  |  9 +--
 config/locales/client.lt.yml                  |  9 +--
 config/locales/client.lv.yml                  |  9 +--
 config/locales/client.nb_NO.yml               |  9 +--
 config/locales/client.nl.yml                  | 29 ++++++--
 config/locales/client.pl_PL.yml               |  9 +--
 config/locales/client.pt.yml                  |  9 +--
 config/locales/client.pt_BR.yml               | 10 ++-
 config/locales/client.ro.yml                  |  9 +--
 config/locales/client.ru.yml                  | 18 +++--
 config/locales/client.sk.yml                  |  9 +--
 config/locales/client.sl.yml                  |  6 +-
 config/locales/client.sq.yml                  |  9 +--
 config/locales/client.sr.yml                  |  9 +--
 config/locales/client.sv.yml                  | 10 ++-
 config/locales/client.sw.yml                  |  7 +-
 config/locales/client.te.yml                  |  9 +--
 config/locales/client.th.yml                  |  4 +-
 config/locales/client.tr_TR.yml               |  9 +--
 config/locales/client.uk.yml                  | 29 ++++++--
 config/locales/client.ur.yml                  |  9 +--
 config/locales/client.vi.yml                  |  9 +--
 config/locales/client.zh_CN.yml               |  9 +--
 config/locales/client.zh_TW.yml               |  9 +--
 config/locales/server.ca.yml                  |  9 +++
 config/locales/server.es.yml                  |  9 ---
 config/locales/server.he.yml                  | 19 +++--
 config/locales/server.it.yml                  |  1 +
 config/locales/server.nl.yml                  |  3 +
 config/locales/server.uk.yml                  | 16 ++++-
 config/locales/server.zh_CN.yml               |  3 -
 .../config/locales/server.ar.yml              |  2 +-
 .../config/locales/server.bs_BA.yml           |  2 +-
 .../config/locales/server.ca.yml              |  2 +-
 .../config/locales/server.da.yml              |  2 +-
 .../config/locales/server.de.yml              |  2 +-
 .../config/locales/server.es.yml              |  2 +-
 .../config/locales/server.fa_IR.yml           |  2 +-
 .../config/locales/server.fi.yml              |  2 +-
 .../config/locales/server.fr.yml              |  2 +-
 .../config/locales/server.gl.yml              |  2 +-
 .../config/locales/server.he.yml              |  2 +-
 .../config/locales/server.hu.yml              |  2 +-
 .../config/locales/server.hy.yml              |  2 +-
 .../config/locales/server.id.yml              |  2 +-
 .../config/locales/server.it.yml              |  2 +-
 .../config/locales/server.ja.yml              |  2 +-
 .../config/locales/server.ko.yml              |  2 +-
 .../config/locales/server.lt.yml              |  2 +-
 .../config/locales/server.nb_NO.yml           |  2 +-
 .../config/locales/server.nl.yml              |  2 +-
 .../config/locales/server.pl_PL.yml           |  2 +-
 .../config/locales/server.pt_BR.yml           |  2 +-
 .../config/locales/server.ru.yml              |  2 +-
 .../config/locales/server.sk.yml              |  2 +-
 .../config/locales/server.sl.yml              |  2 +-
 .../config/locales/server.sw.yml              |  2 +-
 .../config/locales/server.uk.yml              |  2 +-
 .../config/locales/server.ur.yml              |  2 +-
 .../config/locales/server.zh_CN.yml           |  2 +-
 .../config/locales/server.ar.yml              |  4 +-
 .../config/locales/server.bs_BA.yml           |  4 +-
 .../config/locales/server.ca.yml              |  4 +-
 .../config/locales/server.cs.yml              |  4 +-
 .../config/locales/server.da.yml              |  4 +-
 .../config/locales/server.de.yml              |  4 +-
 .../config/locales/server.el.yml              |  2 +-
 .../config/locales/server.es.yml              |  4 +-
 .../config/locales/server.fa_IR.yml           |  2 +-
 .../config/locales/server.fi.yml              |  4 +-
 .../config/locales/server.fr.yml              |  4 +-
 .../config/locales/server.he.yml              |  4 +-
 .../config/locales/server.hu.yml              |  4 +-
 .../config/locales/server.hy.yml              |  4 +-
 .../config/locales/server.it.yml              |  4 +-
 .../config/locales/server.ko.yml              |  4 +-
 .../config/locales/server.nb_NO.yml           |  4 +-
 .../config/locales/server.nl.yml              |  4 +-
 .../config/locales/server.pl_PL.yml           |  4 +-
 .../config/locales/server.pt.yml              |  4 +-
 .../config/locales/server.pt_BR.yml           |  4 +-
 .../config/locales/server.ro.yml              |  4 +-
 .../config/locales/server.ru.yml              |  4 +-
 .../config/locales/server.sk.yml              |  4 +-
 .../config/locales/server.sl.yml              |  4 +-
 .../config/locales/server.sr.yml              |  2 +-
 .../config/locales/server.sw.yml              |  4 +-
 .../config/locales/server.uk.yml              |  4 +-
 .../config/locales/server.ur.yml              |  4 +-
 .../config/locales/server.vi.yml              |  2 +-
 .../config/locales/server.zh_CN.yml           |  4 +-
 112 files changed, 407 insertions(+), 364 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index d67bb0eee5..1444b1e9b1 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -2643,16 +2643,13 @@ ar:
         none: "لا مفاتيح API نشطة حاليًّا."
         user: "الاعضاء"
         title: "API"
-        key: "مفتاح API"
         created: أُنشئ في
         generate: "إنشاء"
-        regenerate: "إعادة إنشاء"
         revoke: "الغاء"
-        confirm_regen: "أمتأكّد من استبدال مفتاح API هذا بواحد جديد؟"
-        confirm_revoke: "هل أنت متأكد من رغبتك في تعطيل هذا المفتاح؟"
-        info_html: "مفتاح API الخاص بك سيسمح لك بانشاء أو تعديل مواضيع باستخدام أليات رسائل JSON."
         all_users: "جميع الاعضاء"
-        note_html: "حافظ على <strong>سرية</strong> هذا المفتاح، اي شخص يحصل عليه يستطيع انشاء مواضيع باسم اي مستخدم اخر"
+        show_details: تفاصيل
+        description: الوصف
+        save: احفظ
       web_hooks:
         title: "Webhooks"
         none: "لا يوجد Webhooks حاليا."
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 505e4c549a..4899a14964 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -1262,15 +1262,13 @@ be:
         none: "Пакуль няма ніводнага актыўнага ключа API."
         user: "Карыстальнік"
         title: "API"
-        key: "ключ API"
         created: створаны
         generate: "згенераваць"
-        regenerate: "перегенерировать"
         revoke: "ануляваць"
-        confirm_regen: "Are you sure you want to replace that API Key with a new one?"
-        confirm_revoke: "Are you sure you want to revoke that key?"
-        info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "All Users"
+        show_details: дэталі
+        description: апісанне
+        save: Захаваць
       web_hooks:
         create: "стварыць"
         save: "стварыць..."
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index dbb35f2d83..f121a3d606 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -2100,16 +2100,13 @@ bg:
         none: "Няма активни API ключове в момента."
         user: "Потребител"
         title: "API"
-        key: "API ключ"
         created: Създадени
         generate: "Генраирай"
-        regenerate: "Регенерирай"
         revoke: "Анулирай"
-        confirm_regen: "Сигурни ли сте, че искате да замените текущия API ключ с нов ? "
-        confirm_revoke: "Сигурни ли сте, че искате да анулирате този ключ? "
-        info_html: "Вашият API ключ ще ви разреши да създавате и обновявате темите чрез JSON извиквания. "
         all_users: "Всички потребители"
-        note_html: "Запазете този ключ <strong>secret</strong>, всички потребители които го имат ще може да правят публикации от всеки потребител. "
+        show_details: "Детайли "
+        description: Описание
+        save: Запази
       web_hooks:
         save: "Запази"
         destroy: "Изтрий"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 27bee3090d..4cbce93054 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -3054,16 +3054,13 @@ bs_BA:
         none: "There are no active API keys right now."
         user: "User"
         title: "API"
-        key: "API Key"
         created: Kreiran
         generate: "Generate"
-        regenerate: "Regenerate"
         revoke: "Revoke"
-        confirm_regen: "Are you sure you want to replace that API Key with a new one?"
-        confirm_revoke: "Are you sure you want to revoke that key?"
-        info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "All Users"
-        note_html: "Keep this key <strong>secret</strong>, all users that have it may create arbitrary posts as any user."
+        show_details: Detalji
+        description: Opis
+        save: Sačuvaj
       web_hooks:
         title: "Webhooks"
         none: "Trenutno nema web-hookova."
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 411bc22d88..ab9f00ae02 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -2381,6 +2381,7 @@ ca:
       tag_groups_placeholder: "Llista (opcional) d'etiquetes de grup permeses"
       manage_tag_groups_link: "Gestioneu els grups d'etiquetes aquí."
       allow_global_tags_label: "Permet també altres etiquetes"
+      tag_group_selector_placeholder: "(Opcional) Grup d’etiquetes"
       topic_featured_link_allowed: "Permet enllaços destacats dins aquesta categoria"
       delete: "Suprimeix categoria"
       create: "Nova categoria"
@@ -3046,18 +3047,23 @@ ca:
         none: "No hi ha claus API actives ara mateix"
         user: "Usuari"
         title: "API"
-        key: "Clau API"
         created: Creat
+        updated: Actualitzat
         last_used: Darrer utilitzat
         never_used: (mai)
         generate: "Genera"
-        regenerate: "Regenera"
+        undo_revoke: "Desfés revocar"
         revoke: "Revoca"
-        confirm_regen: "Esteu segur que voleu reemplaçar aquesta clau API amb una de nova?"
-        confirm_revoke: "Esteu segur que voleu revocar aquesta clau?"
-        info_html: "La clau API us permetrà crear i actualitzar temes fent servir crides JSON."
         all_users: "Tots els usuaris"
-        note_html: "Conserveu aquesta clau <strong>secreta</strong>. Tots els usuaris que la tinguin podrien crear publicacions arbitràries en nom de qualsevol usuari."
+        show_details: Detalls
+        description: Descripció
+        no_description: (sense descripció)
+        all_api_keys: Totes les claus de l'API
+        user_mode: Nivell d’usuari
+        description_placeholder: "Per a què es farà servir aquesta clau?"
+        save: Desa
+        new_key: Nova clau d’API
+        revoked: Revocat
       web_hooks:
         title: "Webhooks"
         none: "Ara no hi ha webhooks."
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 94466288b1..c987e863d9 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -2783,16 +2783,13 @@ cs:
         none: "Nejsou tu žádné aktivní API klíče."
         user: "Uživatel"
         title: "API"
-        key: "API klíč"
         created: Vytvořený
         generate: "Vygenerovat API klíč"
-        regenerate: "Znovu-vygenerovat API klíč"
         revoke: "zrušit"
-        confirm_regen: "Určitě chcete nahradit tenhle API klíč novým?"
-        confirm_revoke: "Jste si jisti, že chcete tento klíč zrušit?"
-        info_html: "Váš API klíč umožní vytvářet a aktualizovat témata pomocí JSONových volání."
         all_users: "Všichni uživatelé"
-        note_html: "Uchovejte tento klíč <strong>v bezpečí</strong>, každý, kdo má tento klíč, může libovolně vytvářet příspěvky na fóru i za ostatní uživatele."
+        show_details: Podrobnosti
+        description: Popis
+        save: Uložit
       web_hooks:
         title: "Webhooks"
         none: "Právě tu nejsou žádné webhooks."
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index e80b35d6ce..b03690fb4e 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -3011,16 +3011,13 @@ da:
         none: "Der er ingen aktive API-nøgler i øjeblikket."
         user: "Bruger"
         title: "API"
-        key: "API-nøgle"
         created: Oprettet
         generate: "Generér"
-        regenerate: "Regenerér"
         revoke: "Tilbagekald"
-        confirm_regen: "Er du sikker på, at du ønsker at erstatte API-nøglen med en ny?"
-        confirm_revoke: "Er du sikker på, at du ønsker at tilbagekalde nøglen?"
-        info_html: "Din API-nøgle giver dig mulighed for at oprette og opdatere emner vha. JSON-kald."
         all_users: "Alle brugere"
-        note_html: "Hold denne nøgle <strong>hemmelig</strong>, alle brugere som har den kan oprette vilkårlige indlæg, som enhver bruger."
+        show_details: Detaljer
+        description: Beskrivelse
+        save: Gem
       web_hooks:
         title: "Webhooks"
         none: "Der er ingen webhooks i øjeblikket"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index ee9597f2a6..fa1060f539 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -3038,16 +3038,14 @@ de:
         none: "Es gibt momentan keine aktiven API-Keys"
         user: "Benutzer"
         title: "API"
-        key: "API-Key"
         created: Erstellt
+        updated: Aktualisiert
         generate: "Erzeugen"
-        regenerate: "Erneuern"
         revoke: "Widerrufen"
-        confirm_regen: "Möchtest du wirklich den API Key mit einem neuen ersetzen?"
-        confirm_revoke: "Möchtest du wirklich den API Key widerrufen?"
-        info_html: "Dein API-Key erlaubt dir das Erstellen und Bearbeiten von Themen via JSON-Aufrufen."
         all_users: "Alle Benutzer"
-        note_html: "Halte diesen Schlüssel <strong>geheim</strong>. Alle Benutzer, die diesen Schlüssel besitzen, können beliebige Beiträge als jeder Benutzer erstellen."
+        show_details: Details
+        description: Beschreibung
+        save: Speichern
       web_hooks:
         title: "Webhooks"
         none: "Aktuell gibt es keine Webhooks."
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 6fa51098a3..fc302bd0e3 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -2318,16 +2318,13 @@ el:
         none: "Δεν υπάρχουν ενεργά κλειδιά API αυτή την στιγμή."
         user: "Χρήστης"
         title: "API"
-        key: "API Key"
         created: Δημιουργήθηκε
         generate: "Δημιουργία"
-        regenerate: "Αναδημιουγία"
         revoke: "Ανάκληση"
-        confirm_regen: "Θέλεις να αντικαταστήσεις το API Key με ένα καινούργιο;"
-        confirm_revoke: "Θέλεις σίγουρα να ανακαλέσεις το API Key;"
-        info_html: "Το API Key σου δίνει τη δυνατότητα να δημιουργήσεις και να επεξεργαστείς νήματα μέσω κλήσεων JSON."
         all_users: "Όλοι οι χρήστες"
-        note_html: "Κράτα αυτό το κλειδί <strong>κρυφό</strong>. Όλοι οι χρήστες που το κατέχουν μπορούν να δημιουργήσουν αναρτήσεις υποδυόμενοι οποιονδήποτε χρήστη χωρίς κανέναν περιορισμό."
+        show_details: Λεπτομέρειες
+        description: Περιγραφή
+        save: Αποθήκευση
       web_hooks:
         title: "Webhooks"
         none: "Δεν υπάρχουν Webhooks αυτή τη στιγμή."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 6342a134bf..d3508bdb2f 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -2387,7 +2387,7 @@ es:
       allow_global_tags_label: "Permitir también otras etiquetas"
       tag_group_selector_placeholder: "(Opcional) Grupo de etiquetas"
       required_tag_group_description: "Requiere temas nuevos para tener etiquetas de un grupo de etiquetas:"
-      min_tags_from_required_group_label: 'Número de etiquetas:'
+      min_tags_from_required_group_label: "Número de etiquetas:"
       required_tag_group_label: "Grupo de etiquetas:"
       topic_featured_link_allowed: "Permitir enlaces destacados en esta categoría"
       delete: "Eliminar categoría"
@@ -3055,18 +3055,16 @@ es:
         none: "No hay ninguna clave de API activa en este momento."
         user: "Usuario"
         title: "API"
-        key: "Clave de API"
         created: Creado
+        updated: Actualizado
         last_used: Usada por última vez
         never_used: (nunca)
         generate: "Generar clave de API"
-        regenerate: "Regenerar"
         revoke: "Revocar"
-        confirm_regen: "¿Estás seguro de que quieres reemplazar esta clave de API por una nueva?"
-        confirm_revoke: "¿Estás seguro de que quieres revocar esta clave?"
-        info_html: "Tu clave de API te permitirá crear y actualizar temas usando llamadas a JSON."
         all_users: "Todos los usuarios"
-        note_html: "Mantén esta clave <strong>secreta</strong> a buen recaudo, cualquier usuario que disponga de ella podría realizar publicaciones bajo el nombre de cualquier usuario."
+        show_details: Detalles
+        description: Descripción
+        save: Guardar
       web_hooks:
         title: "Webhooks"
         none: "Ahora mismo no hay webhooks."
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 148f9b3da5..56db2d5300 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -2393,16 +2393,13 @@ et:
         none: "Hetkel aktiivsed API võtmed puuduvad."
         user: "Kasutaja"
         title: "API"
-        key: "API võti"
         created: Loodud
         generate: "Genereeri"
-        regenerate: "Genereeri uus"
         revoke: "Tühista "
-        confirm_regen: "Oled kindel, et soovid selle API võtme asendada uuega?"
-        confirm_revoke: "Oled kindel, et soovid selle võtme tühistada?"
-        info_html: "See API võti lubab Sul teemasid luua ja uuendada JSON kutsete kaudu."
         all_users: "Kõik kasutajad"
-        note_html: "Hoia seda võtit <strong>salajas</strong>, iga kasutaja, kes seda omab, võib luua suvalisi postitusi suvalise kasutaja nime alt."
+        show_details: Üksikasjad
+        description: Kirjeldus
+        save: Salvesta
       web_hooks:
         title: "Veebihaagid"
         none: "Hetkel veebihaagid puuduvad."
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 75a9cce7fe..c1be6cf0e9 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -2936,16 +2936,13 @@ fa_IR:
         none: "هم اکنون هیچ کلید API فعالی وجود ندارد"
         user: "کاربر"
         title: "API"
-        key: "کلید API"
         created: ساخته شده
         generate: "تولید کردن"
-        regenerate: "ایجاد مجدد"
         revoke: "ابطال"
-        confirm_regen: "آیا می خواهید API موجود را با یک API جدید جایگزین کنید؟"
-        confirm_revoke: "آیا مطمئن هستید که می خواهید کلید را برگردانید؟"
-        info_html: "موضوعات تازه پس از آخرین بازدید شما"
         all_users: "همه کاربران"
-        note_html: "این کلید را <strong>امن</strong> نگه دارید، تمام کاربرانی که آن را دارند می توانند به عنوان هر کاربری نوشته‌های دلخواه ایجاد کنند."
+        show_details: جزئیات
+        description: توضیح
+        save: ذخیره
       web_hooks:
         title: "webhook ها"
         none: "در حال حاضر webhook‌ی وجود ندارد"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 1ef57f2a5c..631a7a9e7f 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -3045,18 +3045,15 @@ fi:
         none: "Aktiivisia API avaimia ei ole määritelty."
         user: "Käyttäjä"
         title: "Rajapinta"
-        key: "Rajapinnan avain"
         created: Luotu
         last_used: Viimeksi käytetty
         never_used: (ei koskaan)
         generate: "Luo"
-        regenerate: "Tee uusi"
         revoke: "Peruuta"
-        confirm_regen: "Oletko varma, että haluat korvata tämän API avaimen uudella?"
-        confirm_revoke: "Oletko varma, että haluat peruuttaa tämän avaimen?"
-        info_html: "Rajapinta-avaimen avulla voi aloittaa ja päivittää ketjuja JSON-pyynnöillä."
         all_users: "Kaikki käyttäjät"
-        note_html: "Pidä tämä avain <strong>salaisena</strong>, sen haltija voi luoda viestejä esiintyen minä hyvänsä käyttäjänä."
+        show_details: Yksityiskohdat
+        description: Kuvaus
+        save: Tallenna
       web_hooks:
         title: "Webhookit"
         none: "Webhookeja ei ole nyt."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 41b88a8ba5..fd0fcfb40d 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -2368,7 +2368,7 @@ fr:
       manage_tag_groups_link: "Gérer les groupes d'étiquettes ici."
       allow_global_tags_label: "Permettre aussi d'autres étiquettes"
       tag_group_selector_placeholder: "(Facultatif) Groupe d'étiquettes"
-      min_tags_from_required_group_label: 'Nombre d''étiquettes :'
+      min_tags_from_required_group_label: "Nombre d'étiquettes :"
       required_tag_group_label: "Groupe d'étiquettes :"
       topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       delete: "Supprimer la catégorie"
@@ -3048,18 +3048,17 @@ fr:
         none: "Il n'y a pas de clés API actives en ce moment."
         user: "Utilisateur"
         title: "API"
-        key: "Clé API"
+        key: "Clé"
         created: Créé
+        updated: Mis à jour
         last_used: Dernière utilisation
         never_used: (jamais)
         generate: "Générer"
-        regenerate: "Regénérer"
         revoke: "Révoquer"
-        confirm_regen: "Êtes-vous sûr de vouloir remplacer cette clé API par une nouvelle ?"
-        confirm_revoke: "Êtes-vous sûr de vouloir révoquer cette clé ?"
-        info_html: "Cette clé vous permettra de créer et mettre à jour des sujets à l'aide d'appels JSON."
         all_users: "Tous les utilisateurs"
-        note_html: "Gardez cette clé <strong>secrète</strong>. Tous les utilisateurs qui la possèdent peuvent créer des messages au nom de n'importe quel utilisateur."
+        show_details: Détails
+        description: Description
+        save: Sauvegarder
       web_hooks:
         title: "Webhooks"
         none: "Il n'y a aucun Webhook actuellement."
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index a6027b46fd..bbdb734339 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -1777,16 +1777,13 @@ gl:
         none: "Non hai chaves activas da API agora mesmo."
         user: "Usuario"
         title: "API"
-        key: "Chave da API"
         created: Creado
         generate: "Xerar"
-        regenerate: "Rexenerar"
         revoke: "Revogar"
-        confirm_regen: "Confirmas a substitución da chave da API por unha nova?"
-        confirm_revoke: "Confirmas a revogación desta chave?"
-        info_html: "A chave da API permitirache crear e actualizar temas usando chamadas JSON."
         all_users: "Todos os usuarios"
-        note_html: "Manter esta chave en <strong>secreto</strong>, todos os usuarios que a teñan poderían crear e publicar co nome da calquera usuario."
+        show_details: Detalles
+        description: Descrición
+        save: Gardar
       web_hooks:
         save: "Gardar"
         destroy: "Eliminar"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 2bfcec5a12..141406dc21 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -2569,7 +2569,7 @@ he:
       allow_global_tags_label: "לאפשר גם תגיות אחרות"
       tag_group_selector_placeholder: "(רשות) קבוצת תגיות"
       required_tag_group_description: "לדרוש שלנושאים חדשים יהיו תגיות מקבוצת תגיות:"
-      min_tags_from_required_group_label: 'מס׳ תגיות:'
+      min_tags_from_required_group_label: "מס׳ תגיות:"
       required_tag_group_label: "קבוצת תגיות:"
       topic_featured_link_allowed: "אפשרו קישורים מומלצים בקטגוריה זו"
       delete: "מחק קטגוריה"
@@ -3283,18 +3283,30 @@ he:
         none: "אין מפתחות API פעילים כרגע."
         user: "משתמש"
         title: "API"
-        key: "מפתח API"
+        key: "מפתח"
         created: נוצר
+        updated: עודכן
         last_used: שימוש אחרון
         never_used: (אף פעם)
         generate: "ייצר"
-        regenerate: "ייצר מחדש"
+        undo_revoke: "ביטול שלילה"
         revoke: "שלול"
-        confirm_regen: "האם ברצונך להחליף את מפתח ה-API באחד חדש?"
-        confirm_revoke: "אתם בטוחים שברצונכם לשלול את המפתח הזה?"
-        info_html: "מפתח הAPI שלך יאפשר לך ליצור ולעדכן נושאים בעזרת קריאות JSON."
         all_users: "כל המשתמשים"
-        note_html: "שמרו על מפתח זה <strong>סודי</strong>, כל משתמש שיחזיק בו יוכל לייצר פרסומים שרירותית, כאילו היה כל משתמש/ת אחרים."
+        active_keys: "מפתחות API פעילים"
+        manage_keys: ניהול מפתחות
+        show_details: פרטים
+        description: תיאור
+        no_description: (אין תיאור)
+        all_api_keys: כל מפתחות ה־API
+        user_mode: דרגת משתמש
+        impersonate_all_users: התחזות לכל משתמש שהוא
+        single_user: "משתמש בודד"
+        user_placeholder: נא להקליד שם משתמש
+        description_placeholder: "למה ישמש המפתח הזה?"
+        save: שמירה
+        new_key: מפתח API חדש
+        revoked: נשל
+        delete: למחוק לצמיתות
       web_hooks:
         title: "Webhooks"
         none: "אין כרגע webhooks."
@@ -3883,6 +3895,9 @@ he:
             change_theme_setting: "שנוי הגדרות ערכת עיצוב"
             disable_theme_component: "נטרול רכיב בערכת עיצוב"
             enable_theme_component: "הפעלת רכיב בערכת עיצוב"
+            api_key_create: "נוצר מפתח api"
+            api_key_update: "עודכן מפתח api"
+            api_key_destroy: "הושמד מפתח api"
         screened_emails:
           title: "הודעות דואר מסוננות"
           description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות."
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 3d013b62da..64fb35ad9a 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -2465,16 +2465,13 @@ hu:
         none: "Jelenleg nincsenek elérhető API kulcsok."
         user: "Felhasználó"
         title: "API"
-        key: "API kulcs"
         created: Létrehozott
         generate: "Generálás"
-        regenerate: "Regenerálás"
         revoke: "Visszavonás"
-        confirm_regen: "Biztosan ki szeretnéd cserélni ezt az API kulcsot egy újra?"
-        confirm_revoke: "Biztosan vissza szeretnéd vonni ezt a kulcsot?"
-        info_html: "Az API kulcsod lehetővé fogja tenni számodra, hogy JSON hívásokkal létrehozz és frissíts témaköröket."
         all_users: "Minden felhasználó"
-        note_html: "Tartsd meg ezt a kulcsot <strong>titkos</strong>, minden felhasználó akinek megvan lehet hogy létrehoz egy korlátlan bejegyzést mint akármelyik felhasználó"
+        show_details: Részletek
+        description: Leírás
+        save: Mentés
       web_hooks:
         title: "Webhooks"
         create: "Létrehoz"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 59d8c2b194..adb01e91b1 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -2768,16 +2768,14 @@ hy:
         none: "Ակտիվ API Key այս պահին չկա:"
         user: "Օգտատեր"
         title: "API"
-        key: "API Key"
         created: Ստեղծված
+        updated: Թարմացված
         generate: "Գեներացնել"
-        regenerate: "Վերագեներացնել"
         revoke: "Հետ կանչել"
-        confirm_regen: "Դուք համոզվա՞ծ եք, որ ցանկանում եք փոխարինել այդ API Key-ն նորով:"
-        confirm_revoke: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հետ կանչել այդ API Key-ն:"
-        info_html: "Ձեր API Key-ն թույլ կտա ստեղծել և թարմացնել թեմաներ՝ օգտագործելով JSON կանչեր:"
         all_users: "Բոլոր Օգտատերերը"
-        note_html: "Պահեք այս բանալին <strong>գաղտնի</strong>, բոլոր օգտատերերը, ովքեր ունեն այն, կարող են ստեղծել կամայական գրառումներ՝ որպես ցանկացած օգտատեր:"
+        show_details: Մանրամասներ
+        description: Նկարագրություն
+        save: Պահպանել
       web_hooks:
         title: "Webhook-ներ"
         none: "Այս պահին webhook-ներ չկան:"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 4f8822c2df..924724e0b8 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -1153,6 +1153,7 @@ id:
       api:
         user: "Pengguna"
         created: Dibuat
+        show_details: Detil
       web_hooks:
         destroy: "Hapus"
         active: "Aktif"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 447c309a95..b76d34c060 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -95,6 +95,12 @@ it:
         x_days:
           one: "%{count} giorno fa"
           other: "%{count}giorni fa"
+        x_months:
+          one: "%{count} mese fa"
+          other: "%{count} mesi fa"
+        x_years:
+          one: "%{count} anno fa"
+          other: "%{count} anni fa"
       later:
         x_days:
           one: "%{count} giorno dopo"
@@ -225,6 +231,7 @@ it:
       other: "{{count}} caratteri"
     related_messages:
       title: "Messaggi correlati"
+      see_all: 'Vedi <a href="%{path}">tutti i messaggi</a> di @ %{username} ...'
     suggested_topics:
       title: "Argomenti Suggeriti"
       pm_title: "Messaggi Suggeriti"
@@ -298,6 +305,8 @@ it:
     banner:
       close: "Nascondi questo annuncio."
       edit: "Modifica questo annuncio >>"
+    pwa:
+      install_banner: "Vuoi <a href>installare %{title} su questo dispositivo?</a>"
     choose_topic:
       none_found: "Nessun argomento trovato."
       title:
@@ -312,7 +321,25 @@ it:
       order_by: "Ordina per"
       in_reply_to: "in risposta a"
       explain:
+        why: "spiega perché questo oggetto è stato aggiunto alla coda"
+        title: "Punteggio revisionabile"
+        formula: "Formula"
+        subtotal: "Totale parziale"
         total: "Totale"
+        min_score_visibility: "Punteggio minimo per visibilità"
+        score_to_hide: "Punteggio per nascondere messaggio"
+        take_action_bonus:
+          name: "ha preso provvedimenti"
+          title: "Quando un membro dello staff sceglie intervenire, la segnalazione riceve un bonus."
+        user_accuracy_bonus:
+          name: "precisione dell&#39;utente"
+          title: "Agli utenti le cui segnalazioni sono state storicamente accettate viene concesso un bonus."
+        trust_level_bonus:
+          name: "livello di esperienza"
+          title: "Gli articoli revisionabili creati da utenti con un livello di esperienza più elevato hanno un punteggio più alto."
+        type_bonus:
+          name: "tipo di bonus"
+          title: "Ad alcune tipologie revisionabili può essere assegnato un bonus dallo staff, per aumentare la loro priorità."
       claim_help:
         optional: "Puoi rivendicare questo elemento per evitare che altri lo revisionino."
         required: "Per poter revisionare gli elementi devi prima rivendicarli."
@@ -584,6 +611,7 @@ it:
         remove_owner: "Rimuovi come Proprietario"
         remove_owner_description: "Rimuovi <b>%{username}</b>come proprietario di questo gruppo "
         owner: "Proprietario"
+        forbidden: "Non puoi ancora visualizzare i membri."
       topics: "Argomenti"
       posts: "Messaggi"
       mentions: "Menzioni"
@@ -596,6 +624,7 @@ it:
         only_admins: "Solo gli amministratori"
         mods_and_admins: "Solo i moderatori e gli amministratori"
         members_mods_and_admins: "Solo i membri del gruppo, i moderatori e gli amministratori"
+        owners_mods_and_admins: "Solo proprietari di gruppi, moderatori e amministratori"
         everyone: "Chiunque"
       notifications:
         watching:
@@ -847,14 +876,19 @@ it:
         disable: "Disabilita"
         enable: "Abilita"
         enable_long: "Abilita codici di backup"
+        manage: "Gestisci i codici di backup. Hai <strong>{{count}}</strong> codici di backup rimanenti."
         copied_to_clipboard: "Copiato nella Clipboard"
         copy_to_clipboard_error: "Errore durante la copia nella Clipboard"
         remaining_codes: "Ti sono rimasti <strong>{{count}}</strong> codici di backup."
+        use: "Usa un codice di backup"
+        enable_prerequisites: "È necessario abilitare un secondo fattore primario prima di generare codici di backup."
         codes:
           title: "Codici di backup generati"
           description: "Ciascuno di questi codici di backup può essere usato una sola volta. Conservali in un posto sicuro ma accessibile."
       second_factor:
         title: "Autenticazione a Due Fattori"
+        enable: "Gestione autenticazione a due fattori"
+        forgot_password: "Ha dimenticato la password?"
         confirm_password_description: "Per favore conferma la tua password per continuare"
         name: "Nome"
         label: "Codice"
@@ -868,10 +902,28 @@ it:
         extended_description: |
           L'autenticazione a due fattori aggiunge ulteriore sicurezza al tuo account attraverso la richiesta di un token usa e getta oltre alla tua password. I token possono essere generati su dispositivi <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> e <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> .
         oauth_enabled_warning: "Tieni presente che gli accessi ai social network saranno disabilitati dopo aver attivato l'autenticazione a due fattori nel tuo account."
+        use: "Usa l&#39;app Authenticator"
         enforced_notice: "E' obbligatorio abilitare l'autenticazione a due fattori per accedere a questo sito."
+        disable: "disabilita"
+        disable_title: "Disabilita Secondo Fattore"
+        disable_confirm: "Sei sicuro di voler disabilitare tutti i secondi fattori?"
         edit: "Modifica"
+        edit_title: "Modifica secondo fattore"
+        edit_description: "Nome del secondo fattore"
+        enable_security_key_description: "Quando la chiave di sicurezza fisica è pronta, premi il pulsante Registra qui sotto."
+        totp:
+          title: "Authenticator basati su Token"
+          add: "Nuovo Authenticator"
+          default_name: "Il mio Authenticator"
         security_key:
           register: "Registrare"
+          title: "Security Keys"
+          add: "Registra Security Key"
+          default_name: "Security Key principale"
+          not_allowed_error: "Il processo di registrazione della Security Key è scaduto o è stato annullato."
+          already_added_error: "Hai già registrato questa Security Key. Non è necessario registrarla di nuovo."
+          edit: "Modifica Security Key"
+          edit_description: "Nome Security Key"
           delete: "Elimina"
       change_about:
         title: "Modifica i dati personali"
@@ -898,6 +950,9 @@ it:
         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."
       change_card_background:
         title: "Sfondo Scheda Utente"
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
@@ -921,6 +976,10 @@ it:
         revoke: "Revoca"
         cancel: "Annulla"
         not_connected: "(non connesso)"
+        confirm_modal_title: "Collega un account %{provider} "
+        confirm_description:
+          account_specific: "Il tuo account %{provider} &#39;%{account_description}&#39; verrà utilizzato per l&#39;autenticazione."
+          generic: "Il tuo account %{provider} verrà utilizzato per l&#39;autenticazione."
       name:
         title: "Nome"
         instructions: "il tuo nome completo (opzionale)"
@@ -1260,6 +1319,7 @@ it:
       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}."
+      logging_in_as: "Accesso come %{email}"
       confirm_button: Completa l'accesso
     login:
       title: "Connetti"
@@ -1267,8 +1327,11 @@ it:
       password: "Password"
       second_factor_title: "Autenticazione a due fattori"
       second_factor_description: "Per favore, inserisci il codice di autenticazione della tua app:"
+      second_factor_backup: "Accedi utilizzando un codice di backup"
       second_factor_backup_title: "Backup Due Fattori"
       second_factor_backup_description: "Per favore, inserisci uno dei tuoi codici di backup:"
+      second_factor: "Accedi utilizzando l&#39;app Authenticator"
+      security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Security Key qui sotto."
       email_placeholder: "email o nome utente"
       caps_lock_warning: "Il Blocco Maiuscole è attivo"
       error: "Errore sconosciuto"
@@ -2935,16 +2998,13 @@ it:
         none: "Non ci sono chiavi API attive al momento."
         user: "Utente"
         title: "API"
-        key: "Chiave API"
         created: Creazione
         generate: "Genera"
-        regenerate: "Rigenera"
         revoke: "Revoca"
-        confirm_regen: "Sei sicuro di voler sostituire la API Key con una nuova?"
-        confirm_revoke: "Sei sicuro di revocare la chiave?"
-        info_html: "La tua chiave API ti permetterà di creare e aggiornare gli argomenti usando chiamate JSON."
         all_users: "Tutti gli Utenti"
-        note_html: "Mantieni <strong>segreta</strong> questa chiave, tutti gli utenti che la possiedono possono creare messaggi per conto di altri."
+        show_details: Dettagli
+        description: Descrizione
+        save: Salva
       web_hooks:
         title: "Webhook"
         none: "Non ci sono webhook disponibili adesso."
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 150f3a8163..f37f11cf40 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -2448,13 +2448,11 @@ ja:
         key: "Key"
         created: 作成者
         generate: "API キーを生成"
-        regenerate: "API キーを再生成"
         revoke: "無効化"
-        confirm_regen: "このAPIキーを新しいものに置き換えてもよろしいですか?"
-        confirm_revoke: "このキーを無効化してもよろしいですか？"
-        info_html: "API キーを使うと、JSON 呼び出しでトピックの作成・更新を行うことが出来ます。"
         all_users: "全てのユーザ"
-        note_html: "このキーは、秘密にしてください。このキーを持っている全てのユーザは任意のユーザとして、好きな投稿を作成できます"
+        show_details: 詳細
+        description: 説明
+        save: 保存
       web_hooks:
         title: "Webhooks"
         none: "現在、Webhooksはありません。"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 69a1b1202d..36667d1dfa 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -2436,16 +2436,13 @@ ko:
         none: "지금 활성화된 API 키가 없습니다."
         user: "사용자"
         title: "API"
-        key: "API 키"
         created: 생성일자
         generate: "API 키 생성"
-        regenerate: "API 키 재생성"
         revoke: "폐지"
-        confirm_regen: "API 키를 새로 발급 받으시겠습니까?"
-        confirm_revoke: "API 키를 폐지하겠습니까?"
-        info_html: "당신의 API 키는 JSON호출을 이용하여 토픽을 생성하거나 수정할 수 있습니다."
         all_users: "전체 유저"
-        note_html: "이 키의 <strong>보안에 특별히 주의</strong>하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 글을 작성할 수 있습니다."
+        show_details: 세부 내용
+        description: 내용
+        save: 저장
       web_hooks:
         title: "Webhook"
         none: "현재 webhook이 없습니다."
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 6e3419fedd..9601193659 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -2423,16 +2423,13 @@ lt:
         none: "Šiuo metu nėra jokių aktyvių API raktų."
         user: "Vartotojas"
         title: "API"
-        key: "API raktas"
         created: Sukurta
         generate: "Generuoti"
-        regenerate: "Pergeneruoti"
         revoke: "Pašalinti"
-        confirm_regen: "Ar tikrai norite pakeisti šį API raktą nauju?"
-        confirm_revoke: "Ar tikrai norite pašalinti šį raktą?"
-        info_html: "Jūsų API raktas leis jums kurti ir atnaujinti temas naudojant JSON užklausas."
         all_users: "Visi vartotojai"
-        note_html: "Tai slapta <strong>funkcija</strong>, su ja gali kurti įrašus bet kokiu vardu."
+        show_details: Detalės
+        description: Aprašymas
+        save: Saugoti
       web_hooks:
         create: "Sukurti"
         save: "Saugoti"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 578aca394b..2148a4200b 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -2283,16 +2283,13 @@ lv:
         none: "Šobrīd nav aktīvu API atslēgu."
         user: "Lietotājs"
         title: "API"
-        key: "API atslēga"
         created: Radīts
         generate: "Radīt"
-        regenerate: "Atkārtoti radīt"
         revoke: "Atsaukt"
-        confirm_regen: "Vai jūs esat drošs, ka vēlaties aizstāt šo API atslēgu ar jaunu?"
-        confirm_revoke: "Vai jūs esat drošs, ka vēlaties atsaukt šo atslēgu?"
-        info_html: "Jūsu API atslēga ļaus jums izveidot un atjaunināt tēmas, izmantojot JSON izsaukumus."
         all_users: "Visi lietotāji"
-        note_html: "Saglabājiet šo atslēgu <strong>slepenu</strong>, jo ikviens lietotājs, kam tā ir zināma, var izveidot jebkādus ierakstus ar jebkuru lietotāju kā autoru."
+        show_details: Detaļas
+        description: Apraksts
+        save: Saglabāt
       web_hooks:
         detailed_instruction: "Ja būs signāls par izvēlēto notikumu, uz norādīto URL tiks nosūtīts POST pieprasījums."
         create: "Izveidot"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 8537a20d27..9e16295b5a 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -2634,16 +2634,13 @@ nb_NO:
         none: "Det finnes ingen aktive API-nøkler akkurat nå."
         user: "Bruker"
         title: "API"
-        key: "Nøkkel"
         created: Opprettet
         generate: "Generer API-nøkkel"
-        regenerate: "Regenerer API-nøkkel"
         revoke: "Trekk tilbake"
-        confirm_regen: "Er du sikker på at du vil erstatte den API-nøkkelen med en ny?"
-        confirm_revoke: "Er du sikker på at du vil trekke tilbake den nøkkelen?"
-        info_html: "API-nøkkelen din vil tillate deg å lage og oppdatere emner ved å bruke JSON-kall."
         all_users: "Alle brukere"
-        note_html: "Hold denne nøkkelen <strong>hemmelig</strong>, alle brukere som har den, vil kunne opprette vilkårlige innlegg som hvilken som helst bruker. "
+        show_details: Detaljer
+        description: Beskrivelse
+        save: Lagre
       web_hooks:
         title: "Webhooker"
         none: "Det finnes ingen webhooker for tiden."
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index b3151379da..4f54aff1e5 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -2387,7 +2387,7 @@ nl:
       allow_global_tags_label: "Ook andere tags toestaan"
       tag_group_selector_placeholder: "(Optioneel) Tag-groep"
       required_tag_group_description: "Nieuwe topics moeten tags hebben uit een tag-groep:"
-      min_tags_from_required_group_label: 'Aantal tags:'
+      min_tags_from_required_group_label: "Aantal tags:"
       required_tag_group_label: "Tag-groep:"
       topic_featured_link_allowed: "Aanbevolen koppelingen in deze categorie toestaan"
       delete: "Categorie verwijderen"
@@ -3055,18 +3055,30 @@ nl:
         none: "Er zijn op dit moment geen actieve API-sleutels."
         user: "Gebruiker"
         title: "API"
-        key: "API-sleutel"
+        key: "Sleutel"
         created: Gemaakt
+        updated: Bijgewerkt
         last_used: Laatst gebruikt
         never_used: (nooit)
         generate: "Genereren"
-        regenerate: "Opnieuw genereren"
+        undo_revoke: "Intrekken ongedaan maken"
         revoke: "Intrekken"
-        confirm_regen: "Weet u zeker dat u die API-sleutel door een nieuwe wilt vervangen?"
-        confirm_revoke: "Weet u zeker dat u die API-sleutel wilt intrekken?"
-        info_html: "Met deze API-sleutel kunt u topics maken en bijwerken met behulp van JSON-aanroepen."
         all_users: "Alle gebruikers"
-        note_html: "Houd deze sleutel <strong>geheim</strong>; alle gebruikers die hierover beschikken, kunnen willekeurige berichten plaatsen als een andere gebruiker."
+        active_keys: "Actieve API-sleutels"
+        manage_keys: Sleutels beheren
+        show_details: Details
+        description: Omschrijving
+        no_description: (geen omschrijving)
+        all_api_keys: Alle API-sleutels
+        user_mode: Gebruikersniveau
+        impersonate_all_users: Een gebruiker imiteren
+        single_user: "Enkele gebruiker"
+        user_placeholder: Voer gebruikersnaam in
+        description_placeholder: "Waar wordt deze sleutel voor gebruikt?"
+        save: Opslaan
+        new_key: Nieuwe API-sleutel
+        revoked: Ingetrokken
+        delete: Definitief verwijderen
       web_hooks:
         title: "Webhooks"
         none: "Er zijn op dit moment geen webhooks."
@@ -3649,6 +3661,9 @@ nl:
             change_theme_setting: "thema-instelling wijzigen"
             disable_theme_component: "themaonderdeel uitschakelen"
             enable_theme_component: "themaonderdeel inschakelen"
+            api_key_create: "api-sleutel maken"
+            api_key_update: "api-sleutel bijwerken"
+            api_key_destroy: "api-sleutel verwijderen"
         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."
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 799c1deca8..3e61775efd 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -3054,16 +3054,13 @@ pl_PL:
         none: "Nie ma teraz aktywnych kluczy API."
         user: "Użytkownik"
         title: "API"
-        key: "Klucz API"
         created: Utworzono
         generate: "Generuj"
-        regenerate: "Odnów"
         revoke: "Unieważnij"
-        confirm_regen: "Czy na pewno chcesz zastąpić ten API Key nowym?"
-        confirm_revoke: "Czy na pewno chcesz unieważnić ten klucz?"
-        info_html: "Twoje klucze API dają dostęp do tworzenia i aktualizowania tenatów przez wywołania JSON."
         all_users: "Wszyscy użytkownicy"
-        note_html: "Zachowaj ten klucz <strong>w tajemnicy</strong>, wszyscy którzy go posiadają mogą tworzyć wpisy jako dowolny użytkownik."
+        show_details: Detale
+        description: Opis
+        save: Zapisz
       web_hooks:
         title: "Webhooks"
         none: "Brak webhooks"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 3d85fde9c3..e1e1c65222 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -2584,16 +2584,13 @@ pt:
         none: "Não existem chaves API ativas neste momento."
         user: "Utilizador"
         title: "API"
-        key: "Chave API"
         created: Criado
         generate: "Gerar"
-        regenerate: "Regenerar"
         revoke: "Revogar"
-        confirm_regen: "Tem a certeza que quer substituir essa chave API por uma nova?"
-        confirm_revoke: "Tem a certeza que quer revogar essa chave?"
-        info_html: "A sua chave API permitirá a criação e edição de tópicos usando pedidos JSON."
         all_users: "Todos os Utilizadores"
-        note_html: "Manter esta chave <strong>secreta</strong>, todos os utilizadores que a tenham poderão criar publicações arbitrárias como qualquer utilizador."
+        show_details: Detalhes
+        description: Descrição
+        save: Guardar
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks neste momento."
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 75fbd61682..b20b460230 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -2981,16 +2981,14 @@ pt_BR:
         none: "Não existem chaves API ativas no momento."
         user: "Usuário"
         title: "API"
-        key: "Chave API"
+        key: "Chave"
         created: Criado
         generate: "Gerar"
-        regenerate: "Regenerar"
         revoke: "Revogar"
-        confirm_regen: "Tem a certeza que quer substituir esta chave API por uma nova?"
-        confirm_revoke: "Tem a certeza que quer revogar esta chave?"
-        info_html: "Sua chave de API permitirá a criação e edição de tópicos usando requests JSON."
         all_users: "Todos os Usuários"
-        note_html: "Guarde esta chave <strong>secretamente</strong>, todos usuários que tiverem acesso a ela poderão criar posts arbritários no forum como qualquer usuário."
+        show_details: Detalhes
+        description: Descrição
+        save: Salvar
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks no momento."
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 025dc089bd..519f0d0fda 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -2477,16 +2477,13 @@ ro:
         none: "Nu sunt chei API principale active deocamdată."
         user: "Utilizator"
         title: "API"
-        key: "Cheie API"
         created: Creat
         generate: "Generare"
-        regenerate: "Regenerare"
         revoke: "Revocă"
-        confirm_regen: "Ești sigur că dorești să înlocuiești această cheie API cu una nouă?"
-        confirm_revoke: "Ești sigur că dorești să revoci această cheie?"
-        info_html: "Cheia ta API îți permite să creezi și să actualizezi subiecte folosind sintaxa JSON."
         all_users: "Toți utilizatorii"
-        note_html: "Păstrează această cheie <strong>secretă</strong>, toți utilizatorii ce o dețin pot crea postări arbitrare pe forum dându-se drept oricare alt utilizator."
+        show_details: Detalii
+        description: Descriere
+        save: Salvează
       web_hooks:
         title: "Webhooks"
         none: "Momentan nu există nici un webhook"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 8869a8230e..c97588fcff 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -1030,6 +1030,9 @@ ru:
         uploaded_avatar_empty: "Добавить собственный аватар"
         upload_title: "Загрузка собственного аватара"
         image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и высота не равны друг другу."
+      change_profile_background:
+        title: "Шапка профиля"
+        instructions: "Шапка профиля будут отцентрирована и по-умолчанию имеют ширину 1110 пикселей."
       change_card_background:
         title: "Фон карточки пользователя"
         instructions: "Картинки фона будут отцентрированы и по-умолчанию имеют ширину 590 пикселей."
@@ -2558,9 +2561,14 @@ ru:
       tags_allowed_tags: "Ограничить эти теги данной категорией:"
       tags_allowed_tag_groups: "Ограничьте эти группы тегов этой категорией:"
       tags_placeholder: "(Необязательно) список доступных тегов"
+      tags_tab_description: "Теги и группы тегов, указанные здесь, будут доступны только в этой категории и других категориях, в которых они также указаны. Они не будут доступны для использования в других категориях."
       tag_groups_placeholder: "(Необязательно) список доступных групп тегов"
       manage_tag_groups_link: "Управлять группами тегов здесь."
       allow_global_tags_label: "Также разрешить другие теги"
+      tag_group_selector_placeholder: "(Необязательно) Группа тегов"
+      required_tag_group_description: "Требовать, чтобы новые темы имели теги из группы тегов:"
+      min_tags_from_required_group_label: "Номер Тега:"
+      required_tag_group_label: "Группа тегов:"
       topic_featured_link_allowed: "Разрешить популярные ссылки в этой категории"
       delete: "Удалить раздел"
       create: "Создать Раздел"
@@ -3070,6 +3078,7 @@ ru:
         parent_tag_description: "Теги из этой группы будут доступны только после добавления к теме родительского тега."
         one_per_topic_label: "Разрешить не более одного тега из этой группы в одной теме"
         new_name: "Назание новой группы"
+        name_placeholder: "Имя Группы Тегов"
         save: "Сохранить"
         delete: "Удалить"
         confirm_delete: "Вы уверены, что хотите удалить эту группу тегов?"
@@ -3272,18 +3281,15 @@ ru:
         none: "Отсутствует ключ API."
         user: "Пользователь"
         title: "API"
-        key: "Ключ API"
         created: Создано
         last_used: Последнее Использование
         never_used: (никогда)
         generate: "Сгенерировать"
-        regenerate: "Перегенерировать"
         revoke: "Отозвать"
-        confirm_regen: "Вы уверены, что хотите заменить ключ API?"
-        confirm_revoke: "Вы уверены, что хотите отозвать этот ключ?"
-        info_html: "Ваш API ключ позволит вам создавать и обновлять темы, используя JSON calls."
         all_users: "Все пользователи"
-        note_html: "Никому <strong>не сообщайте</strong> этот ключ. Тот, у кого он есть, сможет создавать сообщения, выдавая себя за любого пользователя форума."
+        show_details: Детали
+        description: Описание
+        save: Сохранить
       web_hooks:
         title: "Webhooks"
         none: "Сейчас нет веб-перехватчиков."
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index c69f182e00..4ee7bc6df4 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -2382,16 +2382,13 @@ sk:
         none: "V súčasnosti neexistujú žiadne aktívne API kľúče."
         user: "Používateľ"
         title: "API"
-        key: "API kľúč"
         created: Vytvorené
         generate: "Generovať"
-        regenerate: "Obnov"
         revoke: "Zrušiť"
-        confirm_regen: "Ste si istý, že chcete nahradiť tento API kľúč novým?"
-        confirm_revoke: "Ste si istý, že chcete obnoviť tento kľúč?"
-        info_html: "Váš API kľúč Vám umožní vytváranie a aktualizovanie tém prostredníctvom volaní JSON."
         all_users: "Všetci používatelia"
-        note_html: "Držte tento kľúč <strong>v tajnosti</strong>, všetci užívatelia ktorí ho vlastnia môžu vytvárať ľubovoľné príspevky pod ľubovoľným používateľským menom. "
+        show_details: Detaily
+        description: Popis
+        save: Uložiť
       web_hooks:
         create: "Vytvoriť"
         save: "Uložiť"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 7017c65897..209e36ac1e 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -3138,13 +3138,13 @@ sl:
         generate_master: "Generiraj glavni API ključ"
         user: "Uporabnik"
         title: "API"
-        key: "API ključ"
         created: Ustvarjeno
         generate: "Generiraj"
-        regenerate: "Regeneriraj"
         revoke: "Prekliči"
-        confirm_revoke: "Ali ste prepričani da hočete preklicati ta ključ?"
         all_users: "Vsi uporabniki"
+        show_details: Podrobnosti
+        description: Opis
+        save: Shrani
       web_hooks:
         create: "Ustvari"
         save: "Shrani"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 62fec31079..a90b959f54 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -2028,16 +2028,13 @@ sq:
         none: "Për momentin, nuk ka çelësa API aktivë."
         user: "Përdorues"
         title: "API"
-        key: "API Key"
         created: Krijuar
         generate: "Gjenero"
-        regenerate: "Rigjenero"
         revoke: "Revoko"
-        confirm_regen: "Are you sure you want to replace that API Key with a new one?"
-        confirm_revoke: "Are you sure you want to revoke that key?"
-        info_html: "Çelësi juaj API ju lejon të krijoni dhe updejtoni tema nëpërmjet thirrjeve JSON."
         all_users: "Gjithë Përdoruesit"
-        note_html: "Mbaje këtë çelës <strong>sekret</strong>, të gjithë përdoruesit që e kanë mund të krijojnë postime me të. "
+        show_details: Detaje
+        description: Përshkrimi
+        save: Ruaj
       web_hooks:
         title: "Webhooks"
         save: "Ruaj"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index a559ebb30c..f274670118 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -1654,16 +1654,13 @@ sr:
         none: "Nema aktivnih API ključeva"
         user: "Korisnik"
         title: "API"
-        key: "API Ključ"
         created: Napravljeno
         generate: "Generiši"
-        regenerate: "Regeneriši"
         revoke: "Povuci"
-        confirm_regen: "Jeste li sigurni da želite zameniti taj API ključ sa novim?"
-        confirm_revoke: "Jeste li sigurni da želite povući taj ključ?"
-        info_html: "Vaš API ključ će vam dozvoliti da otvarate i nadograđujete teme koristeći JSON pozive."
         all_users: "Svi korisnici"
-        note_html: "Čuvajte ovaj ključ <strong>tajnim</strong>, svi korisnici koji ga imaju mogu stvarati proizvoljne poruke kao bilo koji korisnici."
+        show_details: Detalji
+        description: Opis
+        save: Sačuvaj
       web_hooks:
         save: "Sačuvaj"
         destroy: "Obriši"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 1386d18fb6..12e9342356 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -2179,16 +2179,14 @@ sv:
         none: "Det finns inga aktiva API-nycklar just nu."
         user: "Användare"
         title: "API"
-        key: "API-nyckel"
+        key: "Key"
         created: Skapad
         generate: "Generera"
-        regenerate: "Regenerera"
         revoke: "Återkalla"
-        confirm_regen: "Är du säker på att du vill ersätta den API-nyckeln med en ny?"
-        confirm_revoke: "Är du säker på att du vill återkalla den nyckeln?"
-        info_html: "Din API-nyckel kommer tillåta dig att skapa och uppdatera ämnen med hjälp av JSON-anrop."
         all_users: "Alla användare"
-        note_html: "Håll denna nyckel <strong>hemlig</strong>, alla användare som har den kan skapa godtyckliga inlägg som alla användare."
+        show_details: Detaljer
+        description: Beskrivning
+        save: Spara
       web_hooks:
         title: "Webhookar"
         none: "Det finns inga webhookar just nu."
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 9cadf45e6f..26727679fa 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -2437,14 +2437,13 @@ sw:
         none: "Hakuna funguo za API zilizo amilifu kwa sasa."
         user: "Mtumiaji"
         title: "API"
-        key: "Ufunguo wa API"
         created: Imetengenezwa
         generate: "Tengeneza"
-        regenerate: "Tengeneza Upya"
         revoke: "Futa"
-        confirm_regen: "Una uhakika unataka kufuta ufunguo wa API na kuweka mpya?"
-        confirm_revoke: "Una uhakika unataka kufuta huo ufunguo?"
         all_users: "Watumiaji Wote"
+        show_details: Taarifa
+        description: Maelezo
+        save: hifadhi
       web_hooks:
         create: "Tengeneza"
         save: "Hifadhi"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 4e5bd837b0..4354bc07a8 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -1399,16 +1399,13 @@ te:
         none: "ప్రస్తుతం చేతన ఏపీఐ కీలు లేవు."
         user: "సభ్యుడు"
         title: "ఏపీఐ"
-        key: "ఏపీఐ కీ"
         created: సృష్టించిన
         generate: "ఉత్పత్తించు"
-        regenerate: "పునరుత్పత్తించు"
         revoke: "రివోక్"
-        confirm_regen: "మీరు నిజంగా పాత ఏపీఐ కీని కొత్త దానితో రీప్లేస్ చెయ్యాలనుకుంటున్నారా?"
-        confirm_revoke: "మీరు నిజంగా ఆ కీని రివోకే చెయ్యాలనుకుంటున్నారా? "
-        info_html: "మీ ఏపీఐ కీ జేసన్ వాడి విషయాలు సృష్టించుట, ఉన్నతీకరించుటకు దోహదం చేస్తుంది."
         all_users: "అందరు సభ్యులు"
-        note_html: "ఈ కీ ని <strong> రహస్యంగా ఉంచండి </strong>, అది కలిగివున్న అందరూ వినియోగదారులు ఏ వినియోగదారునిలా నైనా ఏకపక్ష టపాలు సృష్టించవచ్చు."
+        show_details: వివరాలు
+        description: వివరణ
+        save: భద్రపరచు
       web_hooks:
         save: "భద్రపరచు"
         destroy: "తొలగించు"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 7ef92dd008..1e72bd7338 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -1592,9 +1592,11 @@ th:
       api:
         user: "ผู้ใช้"
         title: "API"
-        key: "API Key"
         created: สร้างเมื่อ
         revoke: "เอาออก"
+        show_details: รายละเอียด
+        description: รายละเอียด
+        save: บันทึก
       web_hooks:
         save: "บันทึก"
         destroy: "ลบ"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 3c44d5fe8a..97c86b0a13 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -2918,16 +2918,13 @@ tr_TR:
         none: "Şu an etkin API anahtarı bulunmuyor."
         user: "Kullanıcı"
         title: "API"
-        key: "API Anahtarı"
         created: Oluşturuldu
         generate: "Oluştur"
-        regenerate: "Tekrar Oluştur"
         revoke: "İptal Et"
-        confirm_regen: "API anahtarını yenisi ile değiştirmek istediğine emin misin?"
-        confirm_revoke: "Anahtarı iptal etmek istediğine emin misin?"
-        info_html: "API anahtarın JSON çağrıları kullanarak konu oluşturup güncelleyebilmene olanak sağlayacak."
         all_users: "Tüm Kullanıcılar"
-        note_html: "Bu anahtarı <strong>gizli</strong> tut, anahtara sahip kullanıcılar herhangi bir kullanıcı adı altında istedikleri gönderiyi oluşturabilirler."
+        show_details: Detaylar
+        description: Açıklama
+        save: Kaydet
       web_hooks:
         title: "Web Kancaları"
         none: "Şu anda bir web kancası yok."
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 177970d1ae..a7db0a732b 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -2567,7 +2567,7 @@ uk:
       allow_global_tags_label: "Також дозволити інші мітки"
       tag_group_selector_placeholder: "(Необов’язково) Група тегів"
       required_tag_group_description: "Потрібні нові теми, щоб мати теги з групи тегів:"
-      min_tags_from_required_group_label: 'Кількість тегів:'
+      min_tags_from_required_group_label: "Кількість тегів:"
       required_tag_group_label: "Група тегів:"
       topic_featured_link_allowed: "Дозволити популярні посилання в цій категорії"
       delete: "Видалити категорію"
@@ -3281,18 +3281,30 @@ uk:
         none: "Наразі немає жодного активного ключа API."
         user: "Користувач"
         title: "API"
-        key: "Ключ API"
+        key: "Ключ"
         created: Створено
+        updated: Оновлено
         last_used: Використано
         never_used: (ніколи)
         generate: "Згенерувати"
-        regenerate: "Перегенерувати"
+        undo_revoke: "Скасувати відкликання"
         revoke: "Анулювати"
-        confirm_regen: "Are you sure you want to replace that API Key with a new one?"
-        confirm_revoke: "Are you sure you want to revoke that key?"
-        info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "All Users"
-        note_html: "Нікому <strong>не повідомляйте</strong> цей ключ. Той, у кого він є, зможе створювати повідомлення, видаючи себе за будь-якого користувача форуму."
+        active_keys: "Активні ключі API"
+        manage_keys: Керування ключами
+        show_details: Деталі
+        description: Опис
+        no_description: (без опису)
+        all_api_keys: Усі ключі API
+        user_mode: Користувацький рівень
+        impersonate_all_users: Видавати себе за іншого користувача
+        single_user: "Один користувач"
+        user_placeholder: Введіть ім’я користувача
+        description_placeholder: "Для чого цей ключ буде використовуватися?"
+        save: Зберегти
+        new_key: Новий ключ API
+        revoked: Відкликано
+        delete: Видалити назавжди
       web_hooks:
         title: "Вебгуки"
         none: "Зараз вебгуків немає."
@@ -3881,6 +3893,9 @@ uk:
             change_theme_setting: "змінити налаштування теми"
             disable_theme_component: "відключити компонент теми"
             enable_theme_component: "включити компонент теми"
+            api_key_create: "api ключ створено"
+            api_key_update: "api ключ оновлено"
+            api_key_destroy: "api ключ знищено"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index db26618b01..2546801448 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -3017,16 +3017,13 @@ ur:
         none: "کوئی فعال API کیز اِس وقت موجود نہیں ہیں۔"
         user: "صارف"
         title: "API"
-        key: "API کِی"
         created: بنایا گیا
         generate: "تخلیق کریں"
-        regenerate: "دوبارہ تخلیق کریں"
         revoke: "منسوخ کریں"
-        confirm_regen: "کیا آپ واقعی اُس API کِی کو ایک نئی کِی سے تبدیل کرنا چاہتے ہیں؟"
-        confirm_revoke: "کیا آپ واقعی اُس کِی کو منسوخ کرنا چاہتے ہیں؟"
-        info_html: "API کِی سے آپ JSON کالز کا استعمال کرتے ہوئے ٹاپک بنانے اور اَپ ڈیٹ کرنے قابل ہو جائیں گے۔"
         all_users: "تمام صارفین"
-        note_html: "اس کِی کو<strong>خفیہ</strong> رکھیں، تمام صارفین جن کے پاس یہ ہو گی، کسی بھی صارف کے طور پر من مانی پوسٹس بنا سکتے ہیں۔ "
+        show_details: تفصیلات
+        description: تفصیل
+        save: محفوظ کریں
       web_hooks:
         title: "وَیب ھُوک٘س٘"
         none: "اِس وقت کوئی وَیب ھُوک٘س٘ نہیں ہیں۔"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 485576cfc5..8fdb04c863 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -2270,16 +2270,13 @@ vi:
         none: "Không có API keys nào kích hoạt lúc này."
         user: "Thành viên"
         title: "API"
-        key: "API Key"
         created: Tạo bởi
         generate: "Khởi tạo"
-        regenerate: "Khởi tạo lại"
         revoke: "Thu hồi"
-        confirm_regen: "Bạn muốn thay API Key hiện tại bằng cái mới?"
-        confirm_revoke: "Bạn có chắc chắn muốn hủy bỏ khóa đó?"
-        info_html: "Khóa API cho phép bạn tạo và cập nhật chủ đề sử dụng JSON."
         all_users: "Tất cả Thành viên"
-        note_html: "Giữ khóa nào <strong>bảo mật</strong>, tất cả tài khoản có thể dùng khóa này để tạo bài viết với bất kỳ tài khoản nào."
+        show_details: Chi tiết
+        description: Mô tả
+        save: Lưu
       web_hooks:
         save: "Lưu"
         destroy: "Xóa"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 6dff96bc0f..aaad2a4296 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -2912,16 +2912,13 @@ zh_CN:
         none: "当前没有可用的 API 密钥。"
         user: "用户"
         title: "API"
-        key: "API 密钥"
         created: 创建时间
         generate: "生成"
-        regenerate: "重新生成"
         revoke: "撤销"
-        confirm_regen: "确定要用新的 API 密钥替代该密钥？"
-        confirm_revoke: "确定要撤销该密钥？"
-        info_html: "API 密钥可以用来通过 JSON 调用创建和更新主题。"
         all_users: "所有用户"
-        note_html: "请<strong>安全地</strong>保管密钥，任何拥有该密钥的用户可以使用它以论坛任何用户的名义发帖。"
+        show_details: 详情
+        description: 描述
+        save: 保存
       web_hooks:
         title: "Webhooks"
         none: "当前没有 Webhooks。"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 1966221da9..b5ac3ac8a7 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -2776,16 +2776,13 @@ zh_TW:
         none: "目前沒有啟用中的 API 金鑰。"
         user: "使用者"
         title: "API"
-        key: "API 金鑰"
         created: 已建立
         generate: "產生"
-        regenerate: "重新產生"
         revoke: "撤銷"
-        confirm_regen: "你確定要以新的 API 金鑰取代取的嗎?"
-        confirm_revoke: "你確定要撤銷此金鑰嗎?"
-        info_html: "你可以使用 API 金鑰呼叫 JSON 建立與更新話題。"
         all_users: "所有使用者"
-        note_html: "請<strong>安全地</strong>保管密鑰，任何擁有該密鑰的使用者，都可以使用它以任何的使用者的名義發文。"
+        show_details: 詳細訊息
+        description: 描述
+        save: 儲存
       web_hooks:
         title: "Webhooks"
         none: "當前沒有 Webhooks。"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index e074b51ae5..ace7461e4b 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -2210,6 +2210,9 @@ ca:
         Hola. Veiem que heu estat molt ocupat llegint, cosa fantàstica, de manera que us hem promogut un [nivell de confiança!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/).
 
         Estem molt contents que passeu temps amb nosaltres, i ens agradaria conèixer-vos més bé. Dediqueu un moment a [omplir el vostre perfil](%{base_url}/my/preferences/profile), o bé podeu [començar un tema nou](%{base_url}/categories).
+    welcome_staff:
+      title: "Benvingut membre de l'equip responsable"
+      subject_template: "Enhorabona, ara sou %{role}!"
     welcome_invite:
       title: "Benvingut convidat"
       subject_template: "Benvingut a %{site_name}!"
@@ -3313,6 +3316,12 @@ ca:
     user_merged: "%{username} s'ha combinat en aquest compte"
     user_delete_self: "Suprimit per si mateix des de %{url}"
     webhook_deactivation_reason: "S'ha desactivat automàticament el vostre webhook. Hem rebut diverses respostes d'error d'estat HTTP '%{status}'."
+    api_key:
+      automatic_revoked:
+        one: "Revocat automàticament, fa més d'un %{count} dia de l'última activitat"
+        other: "Revocat automàticament, fa més de %{count} dies de l'última activitat"
+      revoked: Revocat
+      restored: Restaurat
   reviewables:
     priorities:
       low: "Baixa"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 98b6a9272e..a7a3ba7aed 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -2382,15 +2382,6 @@ es:
         Hola. Hemos visto que has estado leyendo, lo cual nos parece fantástico, ¡por lo que te hemos subido tu [nivel de confianza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
 
         Nos alegramos de ver que estés pasando tiempo con nosotros, y nos gustaría saber más sobre ti. Cuando puedas, [rellena tu perfil](%{base_url}/my/preferences/profile) o [crea un nuevo tema](%{base_url}/categories).
-    welcome_moderator:
-      title: "Bienvenido Moderador"
-      subject_template: "¡Felicidades, ahora eres un moderador!"
-      text_body_template: |
-        Has sido promovido con el status de moderador por un miembro del staff.
-
-        Como moderador, ahora tienes acceso a la <a href='%{base_url}/admin' target='_blank'>interfaz de administración</a>.
-
-        Con un gran poder viene una gran responsabilidad. Si eres nuevo en tareas de moderación, por favor sigue la [Guía de Moderación](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Bienvenida al invitado"
       subject_template: "¡Bienvenido a %{site_name}!"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 2ff63575d9..eb16aead39 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -1906,6 +1906,7 @@ he:
     default_title_count_mode: "מצב בררת מחדל למונה כותרות עמודים"
     retain_web_hook_events_period_days: "מספר הימים לשמירת רשומות אירועי התלייה."
     retry_web_hook_events: "לנסות מחדש אירועי התליה שנכשלו במשך 4 פעמים. פרקי הזמן שבין הניסיונות החוזרים הם 1, 5, 25 ו־125 דקות."
+    revoke_api_keys_days: "מספר הימים בטרם שלילה אוטומטית של מפתח API שלא היה בשימוש (0 - לעולם לא)."
     allow_user_api_keys: "איפשור יצירת מפתחות API למשתמשים"
     allow_user_api_key_scopes: "רשימת אזורים מותרים למפתחות API של משתמשים"
     max_api_keys_per_user: "מספר מקסימלי של מפתחות API של משתמש לכל משתמש"
@@ -2509,13 +2510,13 @@ he:
       text_body_template: |
         אהלן. שמנו לב שקריאת הפורום מעסיקה אותך רבות, שזה נהדר, לכן קידמנו את  [דרגת האמון](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) בך!
         אנו מאוד שמחים לראות שנעים לך לקחת חלק בפעילות הקהילתית ונשמח לדעת עוד עליך. ממליצים לך להשקיע רגע קט כדי [למלא את הפרופיל שלך](%{base_url}/my/preferences/profile), או סתם [לפתוח דיון חדש](%{base_url}/categories).
-    welcome_moderator:
-      title: "ברוך בואך לצוות הפיקוח"
-      subject_template: "ברכותינו, הרשאותיך מעתה מאפשרות לך לפקח!"
+    welcome_staff:
+      title: "ברוך בואך לסגל"
+      subject_template: "ברכותינו, הרשאותיך מעכשיו הן %{role}!"
       text_body_template: |
-        הוענק לך מצב פיקוח על ידי מישהו מבין חברי הסגל.
+        קיבלת הרשאות %{role} על ידי מישהו מבין חברי הסגל.
 
-        הרשאות פיקוח מעניקות לך גישה אל <a href='%{base_url}/admin' target='_blank'>מנשק הניהול</a>.
+        הרשאות %{role} מעניקות לך גישה אל <a href='%{base_url}/admin' target='_blank'>מנשק הניהול</a>.
 
         כוח רב טומן בחובו אחריות רבה. אם תחום הפיקוח זר לך, ניתן לפנות אל [המדריך למפקחים](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
@@ -4067,6 +4068,14 @@ he:
     user_merged: "%{username} מוזג לתוך החשבון הזה"
     user_delete_self: "מחיקה עצמית מתוך %{url}"
     webhook_deactivation_reason: "ההתלייה שלך הושבתה אוטומטית. קיבלו מגוון תגובות כשל בצורת HTTP ‚%{status}’."
+    api_key:
+      automatic_revoked:
+        one: "נשלל אוטומטית, הפעילות האחרונה התבצעה לפני למעלה מיום (%{count})"
+        two: "נשלל אוטומטית, הפעילות האחרונה התבצעה לפני למעלה מיומיים (%{count})"
+        many: "נשלל אוטומטית, הפעילות האחרונה התבצעה לפני למעלה מ־%{count} ימים"
+        other: "נשלל אוטומטית, הפעילות האחרונה התבצעה לפני למעלה מ־%{count} ימים"
+      revoked: נשל
+      restored: שוחזר
   reviewables:
     priorities:
       low: "נמוכה"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index f0b950e0bc..c326d6c534 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1944,6 +1944,7 @@ it:
     autoclosed_disabled_lastpost: "Questo argomento è ora aperto. Sono permesse altre risposte."
     auto_deleted_by_timer: "Eliminato automaticamente dal timer."
   login:
+    security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Security Key qui sotto."
     not_approved: "Il tuo account non è ancora stato approvato. Verrai avvertito via mail quando potrai collegarti."
     incorrect_username_email_or_password: "Nome utente, email o password errati"
     incorrect_password: "Password errata"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 7e94f923fd..3b1c409637 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1836,6 +1836,7 @@ nl:
     default_title_count_mode: "Standaardmodus voor de paginatitelteller"
     retain_web_hook_events_period_days: "Aantal dagen voor het behouden van records van webhookgebeurtenissen."
     retry_web_hook_events: "Mislukte webhookgebeurtenissen automatisch 4 keer opnieuw proberen. Tijdsgaten tussen de pogingen zijn 1, 5, 25 en 125 minuten."
+    revoke_api_keys_days: "Aantal dagen voordat een niet-gebruikte API-sleutel van een gebruiker automatisch wordt ingetrokken (0 voor nooit)"
     allow_user_api_keys: "Genereren van API-sleutels van gebruiker toestaan"
     allow_user_api_key_scopes: "Lijst van toegestane scopes voor API-sleutels van gebruiker"
     max_api_keys_per_user: "Maximale aantal API-aanvragen van gebruiker per gebruiker"
@@ -2659,6 +2660,8 @@ nl:
     not_found: "niet gevonden"
     unknown: "onbekend"
     user_merged: "%{username} is met deze account samengevoegd"
+    api_key:
+      revoked: Ingetrokken
   reviewables:
     priorities:
       low: "Laag"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 0497004728..25504ee025 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -2081,9 +2081,6 @@ uk:
       subject_template: "Повідомлення приховано через скарги спільноти, персонал повідомлено"
     welcome_user:
       subject_template: "Ласкаво просимо до сайта %{site_name}!"
-    welcome_moderator:
-      title: "Ласкаво просимо модератор"
-      subject_template: "Вітаємо, ви зараз модератор!"
     welcome_invite:
       title: "Ласкаво просимо"
       subject_template: "Ласкаво просимо до сайта %{site_name}!"
@@ -2749,6 +2746,11 @@ uk:
         few: '&quot;%{tag_name}&quot; обмежено такими категоріями: %{category_names}'
         many: '&quot;%{tag_name}&quot; обмежено такими категоріями: %{category_names}'
         other: '&quot;%{tag_name}&quot; обмежено такими категоріями: %{category_names}'
+    required_tags_from_group:
+      one: "Ви повинні включити принаймні тег %{count} %{tag_group_name}."
+      few: "Ви повинні включити принаймні теги %{count} %{tag_group_name}."
+      many: "Ви повинні включити принаймні теги %{count} %{tag_group_name}."
+      other: "Ви повинні включити принаймні %{count} %{tag_group_name} теги."
   rss_by_tag: "Теми з тегом %{tag}"
   finish_installation:
     congratulations: "Вітаємо, Ви встановили Дискурс!"
@@ -2919,6 +2921,14 @@ uk:
     user_merged: "%{username} був об'єднаний з цим обліковим записом"
     user_delete_self: "Вилучено самостійно з %{url}"
     webhook_deactivation_reason: "Ваш webhook автоматично відключений. Ми отримали декілька відповідей з помилками HTTP-статусу '%{status}'."
+    api_key:
+      automatic_revoked:
+        one: "Автоматично відкликано, останню активність більше, ніж %{count} день тому"
+        few: "Автоматично відкликано, останню активність більше, ніж %{count} днів тому"
+        many: "Автоматично відкликано, останню активність більше, ніж %{count} днів тому"
+        other: "Автоматично відкликано, остання активність більше, ніж %{count} днів тому"
+      revoked: Скасовано
+      restored: Відновлено
   reviewables:
     priorities:
       low: "Низький"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 34515cd3c9..2c4b010fa9 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -2278,9 +2278,6 @@ zh_CN:
         嘿。我们看到你一直在忙着阅读，这太棒了，所以我们已经提升你了[信任等级！](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
 
         我们很高兴你和我们共度时光，我们很想知道更多关于你的事情。花一点时间[填写你的个人资料](%{base_url}/我的/设置/个人信息)，或随时[开始一个新主题](%{base_url}/categories)。
-    welcome_moderator:
-      title: "欢迎版主"
-      subject_template: "恭喜，你现在是版主了！"
     welcome_invite:
       title: "欢迎邀请"
       subject_template: "欢迎来到 %{site_name}！"
diff --git a/plugins/discourse-details/config/locales/server.ar.yml b/plugins/discourse-details/config/locales/server.ar.yml
index 08763d4e38..dfe3786c0d 100644
--- a/plugins/discourse-details/config/locales/server.ar.yml
+++ b/plugins/discourse-details/config/locales/server.ar.yml
@@ -7,4 +7,4 @@
 
 ar:
   site_settings:
-    details_enabled: "فعل خاصية التفاصيل. إذا غيرت هذا ، فيجب عليك إعادة بث جميع المشاركات باستخدام: \"rake posts:rebake\"."
+    details_enabled: 'فعل خاصية التفاصيل. إذا غيرت هذا ، فيجب عليك إعادة بث جميع المشاركات باستخدام: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.bs_BA.yml b/plugins/discourse-details/config/locales/server.bs_BA.yml
index abc3f5ed9e..aeda8f970c 100644
--- a/plugins/discourse-details/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-details/config/locales/server.bs_BA.yml
@@ -7,6 +7,6 @@
 
 bs_BA:
   site_settings:
-    details_enabled: "Uključi opciju detalji. Ukoliko ovo izmijenite, morate odraditi ponovno pečenje svih postova koristeći: \"rake posts:rebake\"."
+    details_enabled: 'Uključi opciju detalji. Ukoliko ovo izmijenite, morate odraditi ponovno pečenje svih postova koristeći: "rake posts:rebake".'
   details:
     excerpt_details: "(kliknite za više detalja)"
diff --git a/plugins/discourse-details/config/locales/server.ca.yml b/plugins/discourse-details/config/locales/server.ca.yml
index ce28317b43..bc31db75a1 100644
--- a/plugins/discourse-details/config/locales/server.ca.yml
+++ b/plugins/discourse-details/config/locales/server.ca.yml
@@ -7,6 +7,6 @@
 
 ca:
   site_settings:
-    details_enabled: "Activa la característica de detalls. Si ho canvieu, haureu de refer totes les publicacions amb: \"rake posts:rebake\"."
+    details_enabled: 'Activa la característica de detalls. Si ho canvieu, haureu de refer totes les publicacions amb: "rake posts:rebake".'
   details:
     excerpt_details: "(feu clic per a més informació)"
diff --git a/plugins/discourse-details/config/locales/server.da.yml b/plugins/discourse-details/config/locales/server.da.yml
index 18d2178d2b..07b34f75e0 100644
--- a/plugins/discourse-details/config/locales/server.da.yml
+++ b/plugins/discourse-details/config/locales/server.da.yml
@@ -7,6 +7,6 @@
 
 da:
   site_settings:
-    details_enabled: "Aktivér 'detaljer' funktion. Hvis du gennemfører denne ændring, skal du omdirigere alle indlæg med: \"rake posts:rebake\"."
+    details_enabled: 'Aktivér ''detaljer'' funktion. Hvis du gennemfører denne ændring, skal du omdirigere alle indlæg med: "rake posts:rebake".'
   details:
     excerpt_details: "(klik for flere detaljer)"
diff --git a/plugins/discourse-details/config/locales/server.de.yml b/plugins/discourse-details/config/locales/server.de.yml
index 97cbe0077e..7aac04e558 100644
--- a/plugins/discourse-details/config/locales/server.de.yml
+++ b/plugins/discourse-details/config/locales/server.de.yml
@@ -7,6 +7,6 @@
 
 de:
   site_settings:
-    details_enabled: "Aktiviert die Details-Funktion. Wenn du dies änderst, musst du alle Beiträge neu „backen“ mit: \"rake posts:rebake\"."
+    details_enabled: 'Aktiviert die Details-Funktion. Wenn du dies änderst, musst du alle Beiträge neu „backen“ mit: "rake posts:rebake".'
   details:
     excerpt_details: "(für mehr Details klicken)"
diff --git a/plugins/discourse-details/config/locales/server.es.yml b/plugins/discourse-details/config/locales/server.es.yml
index 01788e6291..2854d9bf41 100644
--- a/plugins/discourse-details/config/locales/server.es.yml
+++ b/plugins/discourse-details/config/locales/server.es.yml
@@ -7,6 +7,6 @@
 
 es:
   site_settings:
-    details_enabled: "Habilitar la característica de detalles. Si cambias esto, debes hacer rebake de todos los mensajes con: «rake posts:rebake»."
+    details_enabled: 'Habilitar la característica de detalles. Si cambias esto, debes hacer rebake de todos los mensajes con: «rake posts:rebake».'
   details:
     excerpt_details: "(haz clic para más detalles)"
diff --git a/plugins/discourse-details/config/locales/server.fa_IR.yml b/plugins/discourse-details/config/locales/server.fa_IR.yml
index 2753cbd60c..367957ef6a 100644
--- a/plugins/discourse-details/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-details/config/locales/server.fa_IR.yml
@@ -7,6 +7,6 @@
 
 fa_IR:
   site_settings:
-    details_enabled: "به کار گرفتن جزییات. اگر این گزینه را تغییر دادید باید همه پستها را با \"rake posts:rebake\" بازسازی کنید."
+    details_enabled: 'به کار گرفتن جزییات. اگر این گزینه را تغییر دادید باید همه پستها را با "rake posts:rebake" بازسازی کنید.'
   details:
     excerpt_details: "(برای جزئیات بیشتر کلیک کنید)"
diff --git a/plugins/discourse-details/config/locales/server.fi.yml b/plugins/discourse-details/config/locales/server.fi.yml
index c1460eefc6..68e9d1caf7 100644
--- a/plugins/discourse-details/config/locales/server.fi.yml
+++ b/plugins/discourse-details/config/locales/server.fi.yml
@@ -7,6 +7,6 @@
 
 fi:
   site_settings:
-    details_enabled: "Ota käyttöön yksityiskohtaominaisuus. Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: \"rake posts:rebake\". "
+    details_enabled: 'Ota käyttöön yksityiskohtaominaisuus. Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: "rake posts:rebake". '
   details:
     excerpt_details: "(klikkaa saadaksesi lisää tietoa)"
diff --git a/plugins/discourse-details/config/locales/server.fr.yml b/plugins/discourse-details/config/locales/server.fr.yml
index db138519c9..06c2deadb8 100644
--- a/plugins/discourse-details/config/locales/server.fr.yml
+++ b/plugins/discourse-details/config/locales/server.fr.yml
@@ -7,6 +7,6 @@
 
 fr:
   site_settings:
-    details_enabled: "Activer la fonction details. Si vous modifiez ceci, vous devez exécuter la commande \"rake posts:rebake\"."
+    details_enabled: 'Activer la fonction details. Si vous modifiez ceci, vous devez exécuter la commande "rake posts:rebake".'
   details:
     excerpt_details: "(cliquer pour plus de détails)"
diff --git a/plugins/discourse-details/config/locales/server.gl.yml b/plugins/discourse-details/config/locales/server.gl.yml
index 5c817d1a24..374264cd6b 100644
--- a/plugins/discourse-details/config/locales/server.gl.yml
+++ b/plugins/discourse-details/config/locales/server.gl.yml
@@ -7,4 +7,4 @@
 
 gl:
   site_settings:
-    details_enabled: "Activar a función de detalles. Se cambias isto, debes rebocar todas as publicacións con: \"publicacións de rake: rebote\"."
+    details_enabled: 'Activar a función de detalles. Se cambias isto, debes rebocar todas as publicacións con: "publicacións de rake: rebote".'
diff --git a/plugins/discourse-details/config/locales/server.he.yml b/plugins/discourse-details/config/locales/server.he.yml
index b31d72b54f..77fb8feced 100644
--- a/plugins/discourse-details/config/locales/server.he.yml
+++ b/plugins/discourse-details/config/locales/server.he.yml
@@ -7,6 +7,6 @@
 
 he:
   site_settings:
-    details_enabled: "הפעלת תכונת הפירוט. שינוי הגדרה זו תאלץ אותך להכין את כל הפוסטים מחדש בעזרת: „rake posts:rebake”"
+    details_enabled: 'הפעלת תכונת הפירוט. שינוי הגדרה זו תאלץ אותך להכין את כל הפוסטים מחדש בעזרת: „rake posts:rebake”'
   details:
     excerpt_details: "(לחיצה לפרטים נוספים)"
diff --git a/plugins/discourse-details/config/locales/server.hu.yml b/plugins/discourse-details/config/locales/server.hu.yml
index 762ea50ca1..3536d6cb31 100644
--- a/plugins/discourse-details/config/locales/server.hu.yml
+++ b/plugins/discourse-details/config/locales/server.hu.yml
@@ -7,4 +7,4 @@
 
 hu:
   site_settings:
-    details_enabled: "Részletek funkció engedélyezése. Ha megváltoztatod ezt, újra kell tenned az összes bejegyzést ezzel: \"rake posts:rebake\"."
+    details_enabled: 'Részletek funkció engedélyezése. Ha megváltoztatod ezt, újra kell tenned az összes bejegyzést ezzel: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.hy.yml b/plugins/discourse-details/config/locales/server.hy.yml
index 7c0bdfbb52..8e76db17fd 100644
--- a/plugins/discourse-details/config/locales/server.hy.yml
+++ b/plugins/discourse-details/config/locales/server.hy.yml
@@ -7,4 +7,4 @@
 
 hy:
   site_settings:
-    details_enabled: "Միացնել մանրամասների հատկանիշը: Եթե Դուք փոփոխեք սա, Դուք պետք է թարմացնեք բոլոր գրառումները՝ \"rake posts:rebake\" :"
+    details_enabled: 'Միացնել մանրամասների հատկանիշը: Եթե Դուք փոփոխեք սա, Դուք պետք է թարմացնեք բոլոր գրառումները՝ "rake posts:rebake" :'
diff --git a/plugins/discourse-details/config/locales/server.id.yml b/plugins/discourse-details/config/locales/server.id.yml
index 1de356362b..6662b1bf1a 100644
--- a/plugins/discourse-details/config/locales/server.id.yml
+++ b/plugins/discourse-details/config/locales/server.id.yml
@@ -7,4 +7,4 @@
 
 id:
   site_settings:
-    details_enabled: "Aktifkan fitur detail. Jika Anda mengganti ini, Anda perlu memproses ulang semua post dengan: \"rake posts:rebake\""
+    details_enabled: 'Aktifkan fitur detail. Jika Anda mengganti ini, Anda perlu memproses ulang semua post dengan: "rake posts:rebake"'
diff --git a/plugins/discourse-details/config/locales/server.it.yml b/plugins/discourse-details/config/locales/server.it.yml
index 2367bc7c6f..b1d5fb5ea5 100644
--- a/plugins/discourse-details/config/locales/server.it.yml
+++ b/plugins/discourse-details/config/locales/server.it.yml
@@ -7,6 +7,6 @@
 
 it:
   site_settings:
-    details_enabled: "Attiva la funzione dettagli. Se cambi questa impostazione, devi rielaborare tutti i Messaggi con \"rake posts:rebake\""
+    details_enabled: 'Attiva la funzione dettagli. Se cambi questa impostazione, devi rielaborare tutti i Messaggi con "rake posts:rebake"'
   details:
     excerpt_details: "(clicca per ulteriori dettagli)"
diff --git a/plugins/discourse-details/config/locales/server.ja.yml b/plugins/discourse-details/config/locales/server.ja.yml
index fdb1ab2460..179d95d623 100644
--- a/plugins/discourse-details/config/locales/server.ja.yml
+++ b/plugins/discourse-details/config/locales/server.ja.yml
@@ -7,6 +7,6 @@
 
 ja:
   site_settings:
-    details_enabled: "詳細機能を有効にします。これを変更した場合は、「rake posts：rebake」ですべての投稿を再作成する必要があります。"
+    details_enabled: '詳細機能を有効にします。これを変更した場合は、「rake posts：rebake」ですべての投稿を再作成する必要があります。'
   details:
     excerpt_details: "(詳細を見るためにクリック)"
diff --git a/plugins/discourse-details/config/locales/server.ko.yml b/plugins/discourse-details/config/locales/server.ko.yml
index e82190cf43..a454f55755 100644
--- a/plugins/discourse-details/config/locales/server.ko.yml
+++ b/plugins/discourse-details/config/locales/server.ko.yml
@@ -7,4 +7,4 @@
 
 ko:
   site_settings:
-    details_enabled: "상세 기능을 사용. 이를 변경하면 다음 명령어를 사용하여 모든 게시물을 다시 게시해야합니다: \"rake posts:rebake\"."
+    details_enabled: '상세 기능을 사용. 이를 변경하면 다음 명령어를 사용하여 모든 게시물을 다시 게시해야합니다: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.lt.yml b/plugins/discourse-details/config/locales/server.lt.yml
index 0812841c02..994baefe86 100644
--- a/plugins/discourse-details/config/locales/server.lt.yml
+++ b/plugins/discourse-details/config/locales/server.lt.yml
@@ -7,4 +7,4 @@
 
 lt:
   site_settings:
-    details_enabled: "Įgalinti detalią funkciją. Jei tai pakeisite, turėsite paleisti iš naujo visus įrašus su: \"rake posts:rebake\"."
+    details_enabled: 'Įgalinti detalią funkciją. Jei tai pakeisite, turėsite paleisti iš naujo visus įrašus su: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.nb_NO.yml b/plugins/discourse-details/config/locales/server.nb_NO.yml
index 2795879881..6e263d4097 100644
--- a/plugins/discourse-details/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-details/config/locales/server.nb_NO.yml
@@ -7,4 +7,4 @@
 
 nb_NO:
   site_settings:
-    details_enabled: "Aktiver funksjonen for detaljer. Hvis du endrer dette, må du rebake alle innlegg med: \"rake posts:rebake\"."
+    details_enabled: 'Aktiver funksjonen for detaljer. Hvis du endrer dette, må du rebake alle innlegg med: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.nl.yml b/plugins/discourse-details/config/locales/server.nl.yml
index bdccfcc22e..51d3723541 100644
--- a/plugins/discourse-details/config/locales/server.nl.yml
+++ b/plugins/discourse-details/config/locales/server.nl.yml
@@ -7,6 +7,6 @@
 
 nl:
   site_settings:
-    details_enabled: "De details-functie inschakelen. Als u dit wijzigt, moet u alle berichten opnieuw opbouwen met: 'rake posts:rebake'."
+    details_enabled: 'De details-functie inschakelen. Als u dit wijzigt, moet u alle berichten opnieuw opbouwen met: ''rake posts:rebake''.'
   details:
     excerpt_details: "(klik voor meer details)"
diff --git a/plugins/discourse-details/config/locales/server.pl_PL.yml b/plugins/discourse-details/config/locales/server.pl_PL.yml
index c8be336edd..545b695e26 100644
--- a/plugins/discourse-details/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-details/config/locales/server.pl_PL.yml
@@ -7,6 +7,6 @@
 
 pl_PL:
   site_settings:
-    details_enabled: "Aktywuj funkcjonalność detali. Jeśli zmienisz tę opcję, będziesz musiał ponownie rebake’ować wszystkie posty przy użyciu \"rake posts:rebake\"."
+    details_enabled: 'Aktywuj funkcjonalność detali. Jeśli zmienisz tę opcję, będziesz musiał ponownie rebake’ować wszystkie posty przy użyciu "rake posts:rebake".'
   details:
     excerpt_details: "(kliknij, by wyświetlić więcej szczegółów)"
diff --git a/plugins/discourse-details/config/locales/server.pt_BR.yml b/plugins/discourse-details/config/locales/server.pt_BR.yml
index b810bdd2e0..b203b3cd3e 100644
--- a/plugins/discourse-details/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-details/config/locales/server.pt_BR.yml
@@ -7,6 +7,6 @@
 
 pt_BR:
   site_settings:
-    details_enabled: "Habilitar o recurso de detalhes. Se você mudar isso, você deve recompilar todas as postagens com: \"rake posts:rebake\"."
+    details_enabled: 'Habilitar o recurso de detalhes. Se você mudar isso, você deve recompilar todas as postagens com: "rake posts:rebake".'
   details:
     excerpt_details: "(clique para mais detalhes)"
diff --git a/plugins/discourse-details/config/locales/server.ru.yml b/plugins/discourse-details/config/locales/server.ru.yml
index 64d8acbdc4..607b79a333 100644
--- a/plugins/discourse-details/config/locales/server.ru.yml
+++ b/plugins/discourse-details/config/locales/server.ru.yml
@@ -7,6 +7,6 @@
 
 ru:
   site_settings:
-    details_enabled: "Включить дополнительные возможности. Если вы измените данный пункт, то потребуется обновить все посты с помощью команды: \"rake posts:rebake\""
+    details_enabled: 'Включить дополнительные возможности. Если вы измените данный пункт, то потребуется обновить все посты с помощью команды: "rake posts:rebake"'
   details:
     excerpt_details: "(нажмите для более подробной информации)"
diff --git a/plugins/discourse-details/config/locales/server.sk.yml b/plugins/discourse-details/config/locales/server.sk.yml
index 1609e4c7b7..ea18d93dce 100644
--- a/plugins/discourse-details/config/locales/server.sk.yml
+++ b/plugins/discourse-details/config/locales/server.sk.yml
@@ -7,4 +7,4 @@
 
 sk:
   site_settings:
-    details_enabled: "Povoliť vlastnosť detailov. Ak toto zmeníte, musíte znovu sparsovať všetky príspevky: \"rake posts:rebake\"."
+    details_enabled: 'Povoliť vlastnosť detailov. Ak toto zmeníte, musíte znovu sparsovať všetky príspevky: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.sl.yml b/plugins/discourse-details/config/locales/server.sl.yml
index f282cd9077..ccf18a1f0e 100644
--- a/plugins/discourse-details/config/locales/server.sl.yml
+++ b/plugins/discourse-details/config/locales/server.sl.yml
@@ -7,4 +7,4 @@
 
 sl:
   site_settings:
-    details_enabled: "Omogočite skrij besedilo funkcinalnost. Če to spremenite, morate ponovno zapeči vse prispevke z: \"rake posts:rebake\"."
+    details_enabled: 'Omogočite skrij besedilo funkcinalnost. Če to spremenite, morate ponovno zapeči vse prispevke z: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.sw.yml b/plugins/discourse-details/config/locales/server.sw.yml
index 54b75273f7..aba419fb1a 100644
--- a/plugins/discourse-details/config/locales/server.sw.yml
+++ b/plugins/discourse-details/config/locales/server.sw.yml
@@ -7,4 +7,4 @@
 
 sw:
   site_settings:
-    details_enabled: "Wezesha Vipengele vya maelezo. Na kama ukibadilisha, lazima useti machapisho yote kwa kutumia: \"rake posts:rebake\"."
+    details_enabled: 'Wezesha Vipengele vya maelezo. Na kama ukibadilisha, lazima useti machapisho yote kwa kutumia: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.uk.yml b/plugins/discourse-details/config/locales/server.uk.yml
index ecedaf9a52..8017dfd076 100644
--- a/plugins/discourse-details/config/locales/server.uk.yml
+++ b/plugins/discourse-details/config/locales/server.uk.yml
@@ -7,6 +7,6 @@
 
 uk:
   site_settings:
-    details_enabled: "Увімкніть функцію деталей. Якщо змінити, то потрібно відредагувати всі дописи: &quot;rake posts:rebake&quot;."
+    details_enabled: 'Увімкніть функцію деталей. Якщо змінити, то потрібно відредагувати всі дописи: &quot;rake posts:rebake&quot;.'
   details:
     excerpt_details: "(натисніть для отримання детальної інформації)"
diff --git a/plugins/discourse-details/config/locales/server.ur.yml b/plugins/discourse-details/config/locales/server.ur.yml
index 1f894bdc3b..0f14e2f1a3 100644
--- a/plugins/discourse-details/config/locales/server.ur.yml
+++ b/plugins/discourse-details/config/locales/server.ur.yml
@@ -7,6 +7,6 @@
 
 ur:
   site_settings:
-    details_enabled: "تفصیلات کی خصوصیت فعال کریں۔ اگر آپ اس کو تبدیل کرتے ہیں تو، آپ کو تمام پوسٹس کو دوبارہ رِیبَیک کرنا ہوگا: \"rake posts:rebake\""
+    details_enabled: 'تفصیلات کی خصوصیت فعال کریں۔ اگر آپ اس کو تبدیل کرتے ہیں تو، آپ کو تمام پوسٹس کو دوبارہ رِیبَیک کرنا ہوگا: "rake posts:rebake"'
   details:
     excerpt_details: "(مزید تفصیلات کیلئے کلک کریں)"
diff --git a/plugins/discourse-details/config/locales/server.zh_CN.yml b/plugins/discourse-details/config/locales/server.zh_CN.yml
index 2037c581ef..c5417d6739 100644
--- a/plugins/discourse-details/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-details/config/locales/server.zh_CN.yml
@@ -7,6 +7,6 @@
 
 zh_CN:
   site_settings:
-    details_enabled: "启用细节功能。如果你改变了这个选项，必须通过此命令重新调制全部帖子：\"rake posts:rebake\"。"
+    details_enabled: '启用细节功能。如果你改变了这个选项，必须通过此命令重新调制全部帖子："rake posts:rebake"。'
   details:
     excerpt_details: "（点击显示详情）"
diff --git a/plugins/discourse-presence/config/locales/server.ar.yml b/plugins/discourse-presence/config/locales/server.ar.yml
index 6ab62be496..15d898e498 100644
--- a/plugins/discourse-presence/config/locales/server.ar.yml
+++ b/plugins/discourse-presence/config/locales/server.ar.yml
@@ -7,5 +7,5 @@
 
 ar:
   site_settings:
-    presence_enabled: 'أعرض الأعضاء الذين يردون حاليا على موضوع حالي، أو يقومون بالتعديل على منشور حالي؟'
-    presence_max_users_shown: 'تم اضهار اقصى عدد من الأعضاء.'
+    presence_enabled: "أعرض الأعضاء الذين يردون حاليا على موضوع حالي، أو يقومون بالتعديل على منشور حالي؟"
+    presence_max_users_shown: "تم اضهار اقصى عدد من الأعضاء."
diff --git a/plugins/discourse-presence/config/locales/server.bs_BA.yml b/plugins/discourse-presence/config/locales/server.bs_BA.yml
index 8ea8d053d8..133834b211 100644
--- a/plugins/discourse-presence/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-presence/config/locales/server.bs_BA.yml
@@ -7,5 +7,5 @@
 
 bs_BA:
   site_settings:
-    presence_enabled: 'Prikazuje korisnike koji trenutačno odgovaraju na trnenutnu temu, ili ispravljaju trenutnu objavu'
-    presence_max_users_shown: 'Maksimalan broj prikazanih korisnika'
+    presence_enabled: "Prikazuje korisnike koji trenutačno odgovaraju na trnenutnu temu, ili ispravljaju trenutnu objavu"
+    presence_max_users_shown: "Maksimalan broj prikazanih korisnika"
diff --git a/plugins/discourse-presence/config/locales/server.ca.yml b/plugins/discourse-presence/config/locales/server.ca.yml
index 3450d7b714..04a43e3c9d 100644
--- a/plugins/discourse-presence/config/locales/server.ca.yml
+++ b/plugins/discourse-presence/config/locales/server.ca.yml
@@ -7,5 +7,5 @@
 
 ca:
   site_settings:
-    presence_enabled: '¿S''han de mostrar els usuaris que en aquests moments responen al tema actual o editen l''entrada actual?'
-    presence_max_users_shown: 'Nombre màxim d''usuaris mostrats.'
+    presence_enabled: "¿S'han de mostrar els usuaris que en aquests moments responen al tema actual o editen l'entrada actual?"
+    presence_max_users_shown: "Nombre màxim d'usuaris mostrats."
diff --git a/plugins/discourse-presence/config/locales/server.cs.yml b/plugins/discourse-presence/config/locales/server.cs.yml
index 6ca7339ff0..b30107f62c 100644
--- a/plugins/discourse-presence/config/locales/server.cs.yml
+++ b/plugins/discourse-presence/config/locales/server.cs.yml
@@ -7,5 +7,5 @@
 
 cs:
   site_settings:
-    presence_enabled: 'Zobrazit uživatele, kteří právě odpovídají na aktuální téma nebo upravují aktuální příspěvek?'
-    presence_max_users_shown: ' Maximální počet zobrazených uživatelů.'
+    presence_enabled: "Zobrazit uživatele, kteří právě odpovídají na aktuální téma nebo upravují aktuální příspěvek?"
+    presence_max_users_shown: " Maximální počet zobrazených uživatelů."
diff --git a/plugins/discourse-presence/config/locales/server.da.yml b/plugins/discourse-presence/config/locales/server.da.yml
index 8798c120d3..4a96f02f7c 100644
--- a/plugins/discourse-presence/config/locales/server.da.yml
+++ b/plugins/discourse-presence/config/locales/server.da.yml
@@ -7,5 +7,5 @@
 
 da:
   site_settings:
-    presence_enabled: 'Vis brugere, der i øjeblikket svarer på det aktuelle emne, eller redigerer det aktuelle indlæg?'
-    presence_max_users_shown: 'Maksimalt antal viste brugere.'
+    presence_enabled: "Vis brugere, der i øjeblikket svarer på det aktuelle emne, eller redigerer det aktuelle indlæg?"
+    presence_max_users_shown: "Maksimalt antal viste brugere."
diff --git a/plugins/discourse-presence/config/locales/server.de.yml b/plugins/discourse-presence/config/locales/server.de.yml
index 803955b4b8..b282127f73 100644
--- a/plugins/discourse-presence/config/locales/server.de.yml
+++ b/plugins/discourse-presence/config/locales/server.de.yml
@@ -7,5 +7,5 @@
 
 de:
   site_settings:
-    presence_enabled: 'Benutzer anzeigen, die gerade im aktuellen Thema antworten, oder den aktuellen Beitrag bearbeiten?'
-    presence_max_users_shown: 'Maximale Anzahl an angezeigten Benutzern.'
+    presence_enabled: "Benutzer anzeigen, die gerade im aktuellen Thema antworten, oder den aktuellen Beitrag bearbeiten?"
+    presence_max_users_shown: "Maximale Anzahl an angezeigten Benutzern."
diff --git a/plugins/discourse-presence/config/locales/server.el.yml b/plugins/discourse-presence/config/locales/server.el.yml
index 30f4469024..596b434bb0 100644
--- a/plugins/discourse-presence/config/locales/server.el.yml
+++ b/plugins/discourse-presence/config/locales/server.el.yml
@@ -7,4 +7,4 @@
 
 el:
   site_settings:
-    presence_enabled: 'Εμφάνιση των χρηστών που απαντάνε αυτή τη στιγμή στο νήμα ή επεξεργάζονται την τρέχουσα ανάρτηση;'
+    presence_enabled: "Εμφάνιση των χρηστών που απαντάνε αυτή τη στιγμή στο νήμα ή επεξεργάζονται την τρέχουσα ανάρτηση;"
diff --git a/plugins/discourse-presence/config/locales/server.es.yml b/plugins/discourse-presence/config/locales/server.es.yml
index fe6046582e..7c4056831b 100644
--- a/plugins/discourse-presence/config/locales/server.es.yml
+++ b/plugins/discourse-presence/config/locales/server.es.yml
@@ -7,5 +7,5 @@
 
 es:
   site_settings:
-    presence_enabled: '¿Mostrar los usuarios que están respondiendo al tema actual o editando la publicación actual?'
-    presence_max_users_shown: 'Número máximo de usuarios mostrados.'
+    presence_enabled: "¿Mostrar los usuarios que están respondiendo al tema actual o editando la publicación actual?"
+    presence_max_users_shown: "Número máximo de usuarios mostrados."
diff --git a/plugins/discourse-presence/config/locales/server.fa_IR.yml b/plugins/discourse-presence/config/locales/server.fa_IR.yml
index 94d71c910a..2ee856adfd 100644
--- a/plugins/discourse-presence/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/server.fa_IR.yml
@@ -7,4 +7,4 @@
 
 fa_IR:
   site_settings:
-    presence_enabled: 'کاربرانی که در حال حاضر به موضوع فعلی پاسخ می دهند و یا در حال یرایش پست فعلی هستند، نمایش داده شوند؟'
+    presence_enabled: "کاربرانی که در حال حاضر به موضوع فعلی پاسخ می دهند و یا در حال یرایش پست فعلی هستند، نمایش داده شوند؟"
diff --git a/plugins/discourse-presence/config/locales/server.fi.yml b/plugins/discourse-presence/config/locales/server.fi.yml
index 56d5ac5f20..f9a72140e9 100644
--- a/plugins/discourse-presence/config/locales/server.fi.yml
+++ b/plugins/discourse-presence/config/locales/server.fi.yml
@@ -7,5 +7,5 @@
 
 fi:
   site_settings:
-    presence_enabled: 'Näytä ketkä parhaillaan kirjoittavat tai muokkaavat viestiä ketjussa, jossa käyttäjä on?'
-    presence_max_users_shown: 'Kuinka monta käyttäjää enintään näytetään.'
+    presence_enabled: "Näytä ketkä parhaillaan kirjoittavat tai muokkaavat viestiä ketjussa, jossa käyttäjä on?"
+    presence_max_users_shown: "Kuinka monta käyttäjää enintään näytetään."
diff --git a/plugins/discourse-presence/config/locales/server.fr.yml b/plugins/discourse-presence/config/locales/server.fr.yml
index 319785b4fd..ea12363f08 100644
--- a/plugins/discourse-presence/config/locales/server.fr.yml
+++ b/plugins/discourse-presence/config/locales/server.fr.yml
@@ -7,5 +7,5 @@
 
 fr:
   site_settings:
-    presence_enabled: 'Afficher les utilisateurs qui sont en train de répondre au sujet actuel ou modifier le message actuel ?'
-    presence_max_users_shown: 'Nombre maximale d''utilisateurs affiché.'
+    presence_enabled: "Afficher les utilisateurs qui sont en train de répondre au sujet actuel ou modifier le message actuel ?"
+    presence_max_users_shown: "Nombre maximale d'utilisateurs affiché."
diff --git a/plugins/discourse-presence/config/locales/server.he.yml b/plugins/discourse-presence/config/locales/server.he.yml
index 9223c8c7d8..d67d6f9194 100644
--- a/plugins/discourse-presence/config/locales/server.he.yml
+++ b/plugins/discourse-presence/config/locales/server.he.yml
@@ -7,5 +7,5 @@
 
 he:
   site_settings:
-    presence_enabled: 'להציג משתמשים שמגיבים כרגע לנושא הנוכחי או עורכים את הפוסט הנוכחי?'
-    presence_max_users_shown: ' המספר המרבי של משתמשים שיוצגו.'
+    presence_enabled: "להציג משתמשים שמגיבים כרגע לנושא הנוכחי או עורכים את הפוסט הנוכחי?"
+    presence_max_users_shown: " המספר המרבי של משתמשים שיוצגו."
diff --git a/plugins/discourse-presence/config/locales/server.hu.yml b/plugins/discourse-presence/config/locales/server.hu.yml
index 39564af39d..239ea23c17 100644
--- a/plugins/discourse-presence/config/locales/server.hu.yml
+++ b/plugins/discourse-presence/config/locales/server.hu.yml
@@ -7,5 +7,5 @@
 
 hu:
   site_settings:
-    presence_enabled: 'Felhasználók mutatása akik jelenleg válaszolnak a jelenlegi témára, vagy szerkesztik a jelenlegi bejegyzést.'
-    presence_max_users_shown: 'Maximális számú ember amit mutat.'
+    presence_enabled: "Felhasználók mutatása akik jelenleg válaszolnak a jelenlegi témára, vagy szerkesztik a jelenlegi bejegyzést."
+    presence_max_users_shown: "Maximális számú ember amit mutat."
diff --git a/plugins/discourse-presence/config/locales/server.hy.yml b/plugins/discourse-presence/config/locales/server.hy.yml
index 3da6e6457d..86cb7c5feb 100644
--- a/plugins/discourse-presence/config/locales/server.hy.yml
+++ b/plugins/discourse-presence/config/locales/server.hy.yml
@@ -7,5 +7,5 @@
 
 hy:
   site_settings:
-    presence_enabled: 'Ցուցադրե՞լ այն օգտատերերին, որոնք այս պահին պատասխանում են ներկայիս թեմային կամ խմբագրում են ներկայիս գրառումը:'
-    presence_max_users_shown: 'Ցուցադրված օգտատերերի առավելագույն քանակը:'
+    presence_enabled: "Ցուցադրե՞լ այն օգտատերերին, որոնք այս պահին պատասխանում են ներկայիս թեմային կամ խմբագրում են ներկայիս գրառումը:"
+    presence_max_users_shown: "Ցուցադրված օգտատերերի առավելագույն քանակը:"
diff --git a/plugins/discourse-presence/config/locales/server.it.yml b/plugins/discourse-presence/config/locales/server.it.yml
index 9183a04a3a..25d9b31f6a 100644
--- a/plugins/discourse-presence/config/locales/server.it.yml
+++ b/plugins/discourse-presence/config/locales/server.it.yml
@@ -7,5 +7,5 @@
 
 it:
   site_settings:
-    presence_enabled: 'Mostrare gli utenti mentre stanno rispondendo ad un argomento oppure modificando il messaggio corrente?'
-    presence_max_users_shown: 'Massimo numero di utenti visualizzati.'
+    presence_enabled: "Mostrare gli utenti mentre stanno rispondendo ad un argomento oppure modificando il messaggio corrente?"
+    presence_max_users_shown: "Massimo numero di utenti visualizzati."
diff --git a/plugins/discourse-presence/config/locales/server.ko.yml b/plugins/discourse-presence/config/locales/server.ko.yml
index 80a4c1ba0e..a9f2511b4a 100644
--- a/plugins/discourse-presence/config/locales/server.ko.yml
+++ b/plugins/discourse-presence/config/locales/server.ko.yml
@@ -7,5 +7,5 @@
 
 ko:
   site_settings:
-    presence_enabled: '지금 현재의 주제에 답장하는 사용자를 표시하거나 지금의 글을 수정 하시겠습니까?'
-    presence_max_users_shown: '표시되는 최대 사용자 수입니다.'
+    presence_enabled: "지금 현재의 주제에 답장하는 사용자를 표시하거나 지금의 글을 수정 하시겠습니까?"
+    presence_max_users_shown: "표시되는 최대 사용자 수입니다."
diff --git a/plugins/discourse-presence/config/locales/server.nb_NO.yml b/plugins/discourse-presence/config/locales/server.nb_NO.yml
index bdad24301b..fa8f8d5260 100644
--- a/plugins/discourse-presence/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-presence/config/locales/server.nb_NO.yml
@@ -7,5 +7,5 @@
 
 nb_NO:
   site_settings:
-    presence_enabled: 'Vis brukere som akkurat nå svarer på gjeldende emne, eller redigerer gjeldende innlegg?'
-    presence_max_users_shown: 'Maksimalt antall brukere som vises.'
+    presence_enabled: "Vis brukere som akkurat nå svarer på gjeldende emne, eller redigerer gjeldende innlegg?"
+    presence_max_users_shown: "Maksimalt antall brukere som vises."
diff --git a/plugins/discourse-presence/config/locales/server.nl.yml b/plugins/discourse-presence/config/locales/server.nl.yml
index 61be2c2d39..9850fb9871 100644
--- a/plugins/discourse-presence/config/locales/server.nl.yml
+++ b/plugins/discourse-presence/config/locales/server.nl.yml
@@ -7,5 +7,5 @@
 
 nl:
   site_settings:
-    presence_enabled: 'Gebruikers tonen die momenteel op het huidige topic antwoorden, of die het huidige bericht bewerken?'
-    presence_max_users_shown: 'Maximale aantal getoonde gebruikers.'
+    presence_enabled: "Gebruikers tonen die momenteel op het huidige topic antwoorden, of die het huidige bericht bewerken?"
+    presence_max_users_shown: "Maximale aantal getoonde gebruikers."
diff --git a/plugins/discourse-presence/config/locales/server.pl_PL.yml b/plugins/discourse-presence/config/locales/server.pl_PL.yml
index 75a498a1f3..0ad086457a 100644
--- a/plugins/discourse-presence/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-presence/config/locales/server.pl_PL.yml
@@ -7,5 +7,5 @@
 
 pl_PL:
   site_settings:
-    presence_enabled: 'Pokaż użytkowników, którzy aktualnie odpowiadają na bieżący temat lub edytują bieżący wpis?'
-    presence_max_users_shown: 'Maksymalna liczba pokazywanych użytkowników.'
+    presence_enabled: "Pokaż użytkowników, którzy aktualnie odpowiadają na bieżący temat lub edytują bieżący wpis?"
+    presence_max_users_shown: "Maksymalna liczba pokazywanych użytkowników."
diff --git a/plugins/discourse-presence/config/locales/server.pt.yml b/plugins/discourse-presence/config/locales/server.pt.yml
index 92bc905171..ead949ccda 100644
--- a/plugins/discourse-presence/config/locales/server.pt.yml
+++ b/plugins/discourse-presence/config/locales/server.pt.yml
@@ -7,5 +7,5 @@
 
 pt:
   site_settings:
-    presence_enabled: 'Mostrar os utilizadores que estão a responder no tópico atual, ou a editar a publicação atual?'
-    presence_max_users_shown: 'Número máximo de utilizadores exibidos.'
+    presence_enabled: "Mostrar os utilizadores que estão a responder no tópico atual, ou a editar a publicação atual?"
+    presence_max_users_shown: "Número máximo de utilizadores exibidos."
diff --git a/plugins/discourse-presence/config/locales/server.pt_BR.yml b/plugins/discourse-presence/config/locales/server.pt_BR.yml
index f9be26cebc..a3dc62adba 100644
--- a/plugins/discourse-presence/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-presence/config/locales/server.pt_BR.yml
@@ -7,5 +7,5 @@
 
 pt_BR:
   site_settings:
-    presence_enabled: 'Mostrar usuários que estão atualmente respondendo ao tópico atual, ou editando a postagem atual?'
-    presence_max_users_shown: 'Número máximo de usuários exibidos.'
+    presence_enabled: "Mostrar usuários que estão atualmente respondendo ao tópico atual, ou editando a postagem atual?"
+    presence_max_users_shown: "Número máximo de usuários exibidos."
diff --git a/plugins/discourse-presence/config/locales/server.ro.yml b/plugins/discourse-presence/config/locales/server.ro.yml
index bba2871a96..d5da3df1fb 100644
--- a/plugins/discourse-presence/config/locales/server.ro.yml
+++ b/plugins/discourse-presence/config/locales/server.ro.yml
@@ -7,5 +7,5 @@
 
 ro:
   site_settings:
-    presence_enabled: 'Afișează utilizatorii care răspund acum la subiectul curent sau editează subiectul?'
-    presence_max_users_shown: 'Numărul maxim de utilizatori afișați.'
+    presence_enabled: "Afișează utilizatorii care răspund acum la subiectul curent sau editează subiectul?"
+    presence_max_users_shown: "Numărul maxim de utilizatori afișați."
diff --git a/plugins/discourse-presence/config/locales/server.ru.yml b/plugins/discourse-presence/config/locales/server.ru.yml
index b11ac84378..96b5428fa4 100644
--- a/plugins/discourse-presence/config/locales/server.ru.yml
+++ b/plugins/discourse-presence/config/locales/server.ru.yml
@@ -7,5 +7,5 @@
 
 ru:
   site_settings:
-    presence_enabled: 'Показать пользователей, которые отвечают на текущую тему или редактируют текущий пост прямо сейчас?'
-    presence_max_users_shown: 'Максимальное отражаемое количество пользователей, которые отвечают прямо сейчас.'
+    presence_enabled: "Показать пользователей, которые отвечают на текущую тему или редактируют текущий пост прямо сейчас?"
+    presence_max_users_shown: "Максимальное отражаемое количество пользователей, которые отвечают прямо сейчас."
diff --git a/plugins/discourse-presence/config/locales/server.sk.yml b/plugins/discourse-presence/config/locales/server.sk.yml
index f1324fa754..e379ba7a25 100644
--- a/plugins/discourse-presence/config/locales/server.sk.yml
+++ b/plugins/discourse-presence/config/locales/server.sk.yml
@@ -7,5 +7,5 @@
 
 sk:
   site_settings:
-    presence_enabled: 'Chcete zobraziť používateľov, ktorí momentálne odpovedajú na aktuálnu tému, alebo upravujú aktuálny príspevok?'
-    presence_max_users_shown: 'Mazimálny počet zobrazených používateľov.'
+    presence_enabled: "Chcete zobraziť používateľov, ktorí momentálne odpovedajú na aktuálnu tému, alebo upravujú aktuálny príspevok?"
+    presence_max_users_shown: "Mazimálny počet zobrazených používateľov."
diff --git a/plugins/discourse-presence/config/locales/server.sl.yml b/plugins/discourse-presence/config/locales/server.sl.yml
index c78811cd11..9da96d7378 100644
--- a/plugins/discourse-presence/config/locales/server.sl.yml
+++ b/plugins/discourse-presence/config/locales/server.sl.yml
@@ -7,5 +7,5 @@
 
 sl:
   site_settings:
-    presence_enabled: 'Pokaži uporabnike, ki trenutno odgovarjajo na odprto temo ali urejujejo objavo?'
-    presence_max_users_shown: 'Maksimalno prikazano število uporabnikov.'
+    presence_enabled: "Pokaži uporabnike, ki trenutno odgovarjajo na odprto temo ali urejujejo objavo?"
+    presence_max_users_shown: "Maksimalno prikazano število uporabnikov."
diff --git a/plugins/discourse-presence/config/locales/server.sr.yml b/plugins/discourse-presence/config/locales/server.sr.yml
index 5e01d18a51..809f5a4706 100644
--- a/plugins/discourse-presence/config/locales/server.sr.yml
+++ b/plugins/discourse-presence/config/locales/server.sr.yml
@@ -7,4 +7,4 @@
 
 sr:
   site_settings:
-    presence_enabled: 'Prikaži da korisnici trenutno kucaju odgovor ili menjaju poruku'
+    presence_enabled: "Prikaži da korisnici trenutno kucaju odgovor ili menjaju poruku"
diff --git a/plugins/discourse-presence/config/locales/server.sw.yml b/plugins/discourse-presence/config/locales/server.sw.yml
index a27006af01..861a144406 100644
--- a/plugins/discourse-presence/config/locales/server.sw.yml
+++ b/plugins/discourse-presence/config/locales/server.sw.yml
@@ -7,5 +7,5 @@
 
 sw:
   site_settings:
-    presence_enabled: 'Onyesha watumiaji ambao wanaongelea mada ya sasa, au wana hariri mada?'
-    presence_max_users_shown: 'Kiwango cha juu cha watumiaji kilicho onyeshwa.'
+    presence_enabled: "Onyesha watumiaji ambao wanaongelea mada ya sasa, au wana hariri mada?"
+    presence_max_users_shown: "Kiwango cha juu cha watumiaji kilicho onyeshwa."
diff --git a/plugins/discourse-presence/config/locales/server.uk.yml b/plugins/discourse-presence/config/locales/server.uk.yml
index 565efc5398..9a5f332d5a 100644
--- a/plugins/discourse-presence/config/locales/server.uk.yml
+++ b/plugins/discourse-presence/config/locales/server.uk.yml
@@ -7,5 +7,5 @@
 
 uk:
   site_settings:
-    presence_enabled: 'Показати користувачів, які зараз відповідають на поточну тему чи редагують поточну публікацію?'
-    presence_max_users_shown: 'Максимальна кількість показаних користувачів.'
+    presence_enabled: "Показати користувачів, які зараз відповідають на поточну тему чи редагують поточну публікацію?"
+    presence_max_users_shown: "Максимальна кількість показаних користувачів."
diff --git a/plugins/discourse-presence/config/locales/server.ur.yml b/plugins/discourse-presence/config/locales/server.ur.yml
index 583c94a21a..73dad64d3c 100644
--- a/plugins/discourse-presence/config/locales/server.ur.yml
+++ b/plugins/discourse-presence/config/locales/server.ur.yml
@@ -7,5 +7,5 @@
 
 ur:
   site_settings:
-    presence_enabled: 'صارفین کو دکھائیں جو فی الحال موجودہ موضوع کا جواب دے رہے ہیں، یا موجودہ پوسٹ میں ترمیم کر رہے ہیں؟'
-    presence_max_users_shown: 'دکھائے گئے صارفین کی زیادہ سے زیادہ تعداد۔'
+    presence_enabled: "صارفین کو دکھائیں جو فی الحال موجودہ موضوع کا جواب دے رہے ہیں، یا موجودہ پوسٹ میں ترمیم کر رہے ہیں؟"
+    presence_max_users_shown: "دکھائے گئے صارفین کی زیادہ سے زیادہ تعداد۔"
diff --git a/plugins/discourse-presence/config/locales/server.vi.yml b/plugins/discourse-presence/config/locales/server.vi.yml
index a4eeab0d58..123ba83e3b 100644
--- a/plugins/discourse-presence/config/locales/server.vi.yml
+++ b/plugins/discourse-presence/config/locales/server.vi.yml
@@ -7,4 +7,4 @@
 
 vi:
   site_settings:
-    presence_max_users_shown: 'Số lượng người dùng tối đa được hiển thị.'
+    presence_max_users_shown: "Số lượng người dùng tối đa được hiển thị."
diff --git a/plugins/discourse-presence/config/locales/server.zh_CN.yml b/plugins/discourse-presence/config/locales/server.zh_CN.yml
index 75928a8176..0671316e0b 100644
--- a/plugins/discourse-presence/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-presence/config/locales/server.zh_CN.yml
@@ -7,5 +7,5 @@
 
 zh_CN:
   site_settings:
-    presence_enabled: '显示正在回复或者编辑当前主题的用户'
-    presence_max_users_shown: '展示用户数量的最大值。'
+    presence_enabled: "显示正在回复或者编辑当前主题的用户"
+    presence_max_users_shown: "展示用户数量的最大值。"

From f611aa6ada7b9f63789c283b9b3a7f86e1b9ae25 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 6 Nov 2019 16:13:12 +0000
Subject: [PATCH 327/328] FIX: Correct translation key for api key revoke
 button

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

diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index 19999029ea..a0d5bf9f77 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -52,7 +52,7 @@
             {{d-button
               action=(action "undoRevokeKey")
               actionParam=k icon="undo"
-              title="admin.api.undo-revoke"}}
+              title="admin.api.undo_revoke"}}
           {{else}}
             {{d-button
               class="btn-danger"

From 1aa96a5da40ccdf068fdc6532a3ff7c9a26a4520 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 6 Nov 2019 12:31:03 -0500
Subject: [PATCH 328/328] Version bump to v2.4.0.beta7

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

diff --git a/lib/version.rb b/lib/version.rb
index 2116856b1b..748dd2f438 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 4
       TINY  = 0
-      PRE   = 'beta6'
+      PRE   = 'beta7'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end