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

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/accounts_controller.rb
Simple merge

diff --cc app/controllers/admin/settings_controller.rb
Simple merge

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/javascript/styles/mastodon/admin.scss
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc app/models/form/admin_settings.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc app/presenters/instance_presenter.rb
Simple merge

diff --cc app/serializers/rest/instance_serializer.rb
Simple merge

diff --cc app/views/admin/settings/edit.html.haml
index e3ceb4344fe61f191a967ca7f28b4c0358ae2c8d,d9b4bf01b85f021956821fe637e957fc49b4e546..9995e0b2ad86ada258fe10305ac75dce4a00c39d
--- 1/app/views/admin/settings/edit.html.haml
--- 2/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@@ -6,8 -6,11 +6,11 @@@
    .fields-group
      = f.input :site_title, wrapper: :with_label, label: t('admin.settings.site_title')
  
-   .fields-group
-     = f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last
+   .fields-row
+     .fields-row__column.fields-row__column-6.fields-group
 -      = f.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
++      = f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last
+     .fields-row__column.fields-row__column-6.fields-group
+       = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, label: t('admin.settings.registrations_mode.title'), include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
  
    .fields-row
      .fields-row__column.fields-row__column-6.fields-group

diff --cc app/views/layouts/public.html.haml
Simple merge

diff --cc config/locales/ca.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/es.yml
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/oc.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/pt-BR.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc config/settings.yml
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc spec/presenters/instance_presenter_spec.rb
Simple merge