Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.

2 files changed, 18 insertions, 1 deletions

diff --git a/db/migrate/20220316233212_update_kurdish_locales.rb b/db/migrate/20220316233212_update_kurdish_locales.rb
new file mode 100644
index 000000000..36586622f
--- /dev/null
+++ b/db/migrate/20220316233212_update_kurdish_locales.rb
@@ -0,0 +1,17 @@
+class UpdateKurdishLocales < ActiveRecord::Migration[6.1]
+  class User < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+  end
+
+  disable_ddl_transaction!
+
+  def up
+    User.where(locale: 'ku').in_batches.update_all(locale: 'ckb')
+    User.where(locale: 'kmr').in_batches.update_all(locale: 'ku')
+  end
+
+  def down
+    User.where(locale: 'ku').in_batches.update_all(locale: 'kmr')
+    User.where(locale: 'ckb').in_batches.update_all(locale: 'ku')
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8d2894236..241bda8b8 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: 2022_03_10_060959) do
+ActiveRecord::Schema.define(version: 2022_03_16_233212) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"