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

This reverts commit 20780a1eeed56b321daf18ee6bbfe681a51d1bf4.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)

test/javascripts/acceptance/category-chooser-test.js

@@ -29,3 +29,19 @@ QUnit.test("prefill category when category_id is set", async assert => {
     1
   );
 });
+
+QUnit.test("filter is case insensitive", async assert => {
+  const categoryChooser = selectKit(".category-chooser");
+
+  await visit("/");
+  await click("#create-topic");
+  await categoryChooser.expand();
+  await categoryChooser.fillInFilter("bug");
+
+  assert.ok(categoryChooser.rows().length, 1);
+
+  await categoryChooser.emptyFilter();
+  await categoryChooser.fillInFilter("Bug");
+
+  assert.ok(categoryChooser.rows().length, 1);
+});

test/javascripts/acceptance/emoji-picker-test.js

@@ -168,19 +168,6 @@ QUnit.test(
   }
 );
 
-QUnit.test("emoji picker lazy loads emojis", async assert => {
-  await visit("/t/internationalization-localization/280");
-  await click("#topic-footer-buttons .btn.create");
-
-  await click("button.emoji.btn");
-
-  assert.equal(
-    find('.emoji-picker button[title="massage_woman"]').css("background-image"),
-    "none",
-    "it doesn't load invisible emojis"
-  );
-});
-
 QUnit.test("emoji picker persists state", async assert => {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");

test/javascripts/acceptance/preferences-test.js

@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
-
 import User from "discourse/models/user";
 
 acceptance("User Preferences", {

test/javascripts/fixtures/about.js

@@ -1,6 +1,7 @@
 export default {
   "about.json": {
     about: {
+      can_see_about_stats: true,
       stats: {
         topic_count: 27480,
         post_count: 490358,

test/javascripts/helpers/select-kit-helper.js

@@ -32,6 +32,11 @@ async function selectKitFillInFilter(filter, selector) {
   );
 }
 
+async function selectKitEmptyFilter(selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  await fillIn(`${selector} .filter-input`, "");
+}
+
 async function selectKitSelectRowByValue(value, selector) {
   checkSelectKitIsNotCollapsed(selector);
   await click(`${selector} .select-kit-row[data-value='${value}']`);
@@ -180,6 +185,10 @@ export default function selectKit(selector) {
       await selectKitFillInFilter(filter, selector);
     },
 
+    async emptyFilter() {
+      await selectKitEmptyFilter(selector);
+    },
+
     async keyboard(value, target) {
       await keyboardHelper(value, target, selector);
     },