Merge branch 'glitch'

2 files changed, 8 insertions, 1 deletions

diff --git a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
new file mode 100644
index 000000000..c9db3800d
--- /dev/null
+++ b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
@@ -0,0 +1,7 @@
+class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    CustomEmoji.in_batches.update_all('domain = lower(domain)')
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6e30ed120..4d02aad0e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_12_04_215309) do
+ActiveRecord::Schema.define(version: 2018_12_07_011115) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"