diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-08-09 23:25:49 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-08-09 23:25:49 +0200 |
commit | 8ec4be4233d2bfd9142860b25df639fc23655f0f (patch) | |
tree | e0b7f33c4ae22827a7a56aa9cac5fabdd77ee57f /config/navigation.rb | |
parent | a61645ed30b854a1b4935026801eb5b287954095 (diff) | |
parent | 4ac78e2a066508a54de82f1d910ef2fd36c3d106 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.
Diffstat (limited to 'config/navigation.rb')
-rw-r--r-- | config/navigation.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/navigation.rb b/config/navigation.rb index 805a21c04..d4818dbb5 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -24,6 +24,7 @@ SimpleNavigation::Configuration.run do |navigation| 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 :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_url, 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|/settings/migration|/settings/aliases|/settings/login_activities} |