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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/invites_controller.rb
index 52cddc404426ad8f5b6a92fce4ee89779201ccab,de5280305e90cd00877ea029b03a8047653cfe09..639002964ecb42e242906e99a5e5cac07c8bd10e
--- 1/app/controllers/invites_controller.rb
--- 2/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@@ -39,12 -38,8 +39,12 @@@ class InvitesController < ApplicationCo
  
    private
  
 +  def set_pack
 +    use_pack 'settings'
 +  end
 +
    def invites
-     Invite.where(user: current_user).order(id: :desc)
+     current_user.invites.order(id: :desc)
    end
  
    def resource_params

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

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

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

diff --cc config/navigation.rb
index 52d41f72f9ec827b2fbfc64959e8ef30c4cb0ab2,5ab2e439992e27b47bfe706b154ad47dd9542d28..244fe03d3e1a59e546c923205c32d9c70b86dfd6
--- 1/config/navigation.rb
--- 2/config/navigation.rb
+++ b/config/navigation.rb
@@@ -16,14 -16,8 +16,14 @@@ SimpleNavigation::Configuration.run do 
        s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url
      end
  
-     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 :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
 +
+     n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url, if: -> { current_user.functional? }
+     n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? }
  
      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}

diff --cc db/schema.rb
Simple merge

diff --cc lib/mastodon/version.rb
index cd216b92df5972fabb26889e6665ee8db3a645c7,3db57ceaa5d136e132651b1c9b5c478992f289b9..4645feb2f3f816afde3147ac90a3c93d4c841006
--- 1/lib/mastodon/version.rb
--- 2/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@@ -24,14 -20,14 +20,14 @@@ module Mastodo
        ''
      end
  
-     def to_a
-       [major, minor, patch, pre].compact
-     end
- 
      def suffix
 -      ''
 +      '+glitch'
      end
  
+     def to_a
+       [major, minor, patch].compact
+     end
+ 
      def to_s
        [to_a.join('.'), flags, suffix].join
      end