about summary refs log tree commit diff
path: root/config/navigation.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-11-26 22:53:55 +0100
committerClaire <claire.github-309c@sitedethib.com>2021-11-26 22:53:55 +0100
commit9b861d56a9646e75caf1f7d60fa9eade566d3740 (patch)
treea45059ea258e035c6f63e966973629b9cd0766b8 /config/navigation.rb
parent97151840b02499a0cec1360907a6b86a1df02b3b (diff)
parent1c826471e7d964f0fdb2dc2b89dcd5a19c017538 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
Diffstat (limited to 'config/navigation.rb')
-rw-r--r--config/navigation.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/navigation.rb b/config/navigation.rb
index 846d76c48..53ee3d6c1 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -7,7 +7,6 @@ SimpleNavigation::Configuration.run do |navigation|
     n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_url, if: -> { current_user.functional? } do |s|
       s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_url
       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
 
     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, if: -> { current_user.functional? } do |s|