Merge branch 'stable' into develop

Changelog.md

@@ -47,6 +47,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
 ## Refactor
 * Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
 * Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110)
+* Add link to pod statistics in right navigation [#6117](https://github.com/diaspora/diaspora/pull/6117)
 
 ## Bug fixes
 * Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)

app/views/shared/_links.haml

@@ -2,6 +2,7 @@
 %li= link_to 'wiki', "https://wiki.diasporafoundation.org"
 %li= link_to t('layouts.application.whats_new'), changelog_url
 %li= link_to t('layouts.header.code') + " " + pod_version, "#{source_url}", {:title => t('layouts.application.source_package')}
+%li= link_to t("layouts.application.statistics_link"), statistics_path
 %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
 - if AppConfig.settings.terms.enable?
     %li= link_to(t('_terms'), terms_path)

config/locales/diaspora/en.yml

@@ -645,6 +645,7 @@ en:
     application:
       powered_by: "Powered by diaspora*"
       whats_new: "What’s new?"
+      statistics_link: "Pod statistics"
       toggle: "Toggle mobile"
       public_feed: "Public diaspora* feed for %{name}"
       your_aspects: "Your aspects"