about summary refs log tree commit diff
path: root/config/navigation.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-16 17:10:27 +0100
committerGitHub <noreply@github.com>2019-03-16 17:10:27 +0100
commit6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (patch)
tree97325ab7ad5a572170637da7a72ba72b7231a02f /config/navigation.rb
parentc2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff)
parent0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (diff)
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/navigation.rb')
-rw-r--r--config/navigation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/navigation.rb b/config/navigation.rb
index f74c98ab2..e730edfa2 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -14,7 +14,6 @@ SimpleNavigation::Configuration.run do |navigation|
       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 :follower_domains, safe_join([fa_icon('users fw'), t('settings.followers')]), settings_follower_domains_url
     end
 
     primary.item :flavours, safe_join([fa_icon('paint-brush fw'), t('settings.flavours')]), settings_flavours_url do |flavours|
@@ -23,6 +22,7 @@ SimpleNavigation::Configuration.run do |navigation|
       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' }