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

Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.

diff --cc Gemfile.lock
Simple merge

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

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

diff --cc app/controllers/settings/preferences_controller.rb
index 241053261b895fe412062ece7eef23f8cb78323a,5afdf0eec0d34609f248e2a338e13325ec341584..eb7a0eb4aa1b0ed45ed9556332458c8884b5e6f2
--- 1/app/controllers/settings/preferences_controller.rb
--- 2/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@@ -42,11 -45,11 +42,11 @@@ class Settings::PreferencesController 
        :setting_reduce_motion,
        :setting_system_font_ui,
        :setting_noindex,
 -      :setting_theme,
        :setting_hide_network,
 +      :setting_hide_followers_count,
        :setting_aggregate_reblogs,
        :setting_show_application,
-       notification_emails: %i(follow follow_request reblog favourite mention digest report),
+       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
        interactions: %i(must_be_follower must_be_following)
      )
    end

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

diff --cc app/models/form/admin_settings.rb
index 5b71dfad5c8476e604adbf1e75ec27d140ce2322,86a86ec6661275de64b9d270a358c66674b50718..83d303c338aa77280438bf09fabacb7a623f27db
--- 1/app/models/form/admin_settings.rb
--- 2/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@@ -51,13 -47,10 +51,14 @@@ class Form::AdminSetting
      mascot
    ).freeze
  
 +  PSEUDO_KEYS = %i(
 +    flavour_and_skin
 +  ).freeze
 +
    attr_accessor(*KEYS)
  
-   validates :site_short_description, :site_description, :site_extended_description, :site_terms, :closed_registrations_message, html: true
+   validates :site_short_description, :site_description, html: { wrap_with: :p }
+   validates :site_extended_description, :site_terms, :closed_registrations_message, html: true
    validates :registrations_mode, inclusion: { in: %w(open approved none) }
    validates :min_invite_role, inclusion: { in: %w(disabled user moderator admin) }
    validates :site_contact_email, :site_contact_username, presence: true

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

diff --cc app/views/admin/pending_accounts/index.html.haml
index 1bfd3824f63d2048b5215be58726c82924e51a7e,7ce5b8213aeee97350d93f44f444c62dc8d9849e..171976e333e3481d1e2b6d165cedd8648a157369
--- 1/app/views/admin/pending_accounts/index.html.haml
--- 2/app/views/admin/pending_accounts/index.html.haml
+++ b/app/views/admin/pending_accounts/index.html.haml
@@@ -1,7 -1,10 +1,7 @@@
  - content_for :page_title do
    = t('admin.pending_accounts.title', count: User.pending.count)
  
- = form_for(@form, url: admin_pending_accounts_path, method: :patch) do |f|
 -- content_for :header_tags do
 -  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
 -
+ = form_for(@form, url: batch_admin_pending_accounts_path) do |f|
    = hidden_field_tag :page, params[:page] || 1
  
    .batch-table

diff --cc app/views/settings/preferences/show.html.haml
Simple merge

diff --cc config/locales/en.yml
index bf06dc9adcb584db771fc15243040b3e22914719,838d6adc325ab158cc0b529a7c9742b56407a322..c208298eb1b8b7dd94f6a138c3733414eb5a9dce
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -871,9 -869,9 +873,10 @@@ en
      edit_profile: Edit profile
      export: Data export
      featured_tags: Featured hashtags
 +    flavours: Flavours
      identity_proofs: Identity proofs
      import: Import
+     import_and_export: Import and export
      migrate: Account migration
      notifications: Notifications
      preferences: Preferences

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

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

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

diff --cc config/navigation.rb
index 553a672edc132dbbfbf154d6e44ff2a66ae2d042,c2a8e45cea0a672ae38e5ae6ee26c09720a0f20f..16a99731aa2327298c65b4c23046be3dc8733b1d
--- 1/config/navigation.rb
--- 2/config/navigation.rb
+++ b/config/navigation.rb
@@@ -1,56 -1,53 +1,60 @@@
  # frozen_string_literal: true
  
  SimpleNavigation::Configuration.run do |navigation|
-   navigation.items do |primary|
-     primary.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
- 
-     primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
-       settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
-       settings.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url
-       settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
-       settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
-       settings.item :password, safe_join([fa_icon('lock fw'), t('auth.security')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
-       settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
-       settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
-       settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
-       settings.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
-       settings.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
+   navigation.items do |n|
+     n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
+ 
+     n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_url do |s|
+       s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
+       s.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url
+       s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
      end
  
-     primary.item :flavours, safe_join([fa_icon('paint-brush fw'), t('settings.flavours')]), settings_flavours_url do |flavours|
+     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, highlights_on: %r{/settings/preferences|/settings/notifications}
++
++    n.item :flavours, safe_join([fa_icon('paint-brush fw'), t('settings.flavours')]), settings_flavours_url do |flavours|
 +      Themes.instance.flavours.each do |flavour|
 +        flavours.item flavour.to_sym, safe_join([fa_icon('star fw'), t("flavours.#{flavour}.name", default: flavour)]), settings_flavour_url(flavour)
 +      end
 +    end
 +
-     primary.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
-     primary.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
-     primary.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' }
+     n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
+     n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
+ 
+     n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_url do |s|
+       s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
+       s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
+       s.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
+     end
  
-     primary.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url do |development|
-       development.item :your_apps, safe_join([fa_icon('list fw'), t('settings.your_apps')]), settings_applications_url, highlights_on: %r{/settings/applications}
+     n.item :data, safe_join([fa_icon('cloud-download fw'), t('settings.import_and_export')]), settings_export_url do |s|
+       s.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
+       s.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
      end
  
-     primary.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), admin_reports_url, if: proc { current_user.staff? } do |admin|
-       admin.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_url
-       admin.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports}
-       admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts|/admin/pending_accounts}
-       admin.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
-       admin.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
-       admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
-       admin.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
+     n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' }
+     n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url
+ 
+     n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), admin_reports_url, if: proc { current_user.staff? } do |s|
+       s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_url
+       s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports}
+       s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts|/admin/pending_accounts}
+       s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
+       s.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
+       s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
+       s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
      end
  
-     primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |admin|
-       admin.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url
-       admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/settings}
-       admin.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis}
-       admin.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/relays}
-       admin.item :subscriptions, safe_join([fa_icon('paper-plane-o fw'), t('admin.subscriptions.title')]), admin_subscriptions_url, if: -> { current_user.admin? }
-       admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
-       admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
+     n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |s|
+       s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url
+       s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/settings}
+       s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis}
+       s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/relays}
+       s.item :subscriptions, safe_join([fa_icon('paper-plane-o fw'), t('admin.subscriptions.title')]), admin_subscriptions_url, if: -> { current_user.admin? }
+       s.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
+       s.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
      end
  
-     primary.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' }
+     n.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' }
    end
  end

diff --cc config/routes.rb
Simple merge

diff --cc config/settings.yml
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge