diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-06 12:06:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 12:06:59 +0200 |
| commit | 286bf110c3e69042049968440f1eb99372a7e0e6 (patch) | |
| tree | ddf1c32803022cb200087a8c4c6818612ca76d3b /app/views/application/_sidebar.html.haml | |
| parent | 0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff) | |
| parent | 4434e2eb7f9942b44561c2f7702af3ed3854b8db (diff) | |
Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/application/_sidebar.html.haml')
| -rw-r--r-- | app/views/application/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml index 90c8f9dd1..33e7c96fe 100644 --- a/app/views/application/_sidebar.html.haml +++ b/app/views/application/_sidebar.html.haml @@ -5,7 +5,7 @@ .hero-widget__text %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) -- if Setting.trends +- if Setting.trends && !(user_signed_in? && !current_user.setting_trends) - trends = TrendingTags.get(3) - unless trends.empty? |