From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 28 Jul 2019 14:28:05 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bca3825c17dd2087f826d9269bb80537bd4ff395;p=mastodon.git

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

bca3825c17dd2087f826d9269bb80537bd4ff395
diff --cc app/controllers/invites_controller.rb
index 52cddc404,de5280305..639002964
--- a/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 config/navigation.rb
index 52d41f72f,5ab2e4399..244fe03d3
--- a/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 :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
-     n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
+     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 lib/mastodon/version.rb
index cd216b92d,3db57ceaa..4645feb2f
--- a/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