diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 09:29:23 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 09:29:23 +0100 |
| commit | be493b6c0d60778257cbd6247f9287f939fc7e4e (patch) | |
| tree | 07c127fc0e059ccd185c40a3c4497706f3bcacc7 /config/navigation.rb | |
| parent | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff) | |
| parent | a5c24d5c4d75f3f3144f69c8f60f542707a82584 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.
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 a85670500..47993e7a6 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -40,6 +40,7 @@ SimpleNavigation::Configuration.run do |navigation| n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url, if: -> { current_user.functional? } n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_tags_path, if: proc { current_user.staff? } do |s| + s.item :statuses, safe_join([fa_icon('comments-o fw'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses} s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/tags|/admin/trends/tags} s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links} end |