Merge branch 'feature-privacy-federation' into development

4 files changed, 18 insertions, 5 deletions

diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml
index 88bfe3d61..022a3a9e4 100644
--- a/app/views/about/index.html.haml
+++ b/app/views/about/index.html.haml
@@ -32,6 +32,7 @@
       = link_to t('about.learn_more'), about_more_path
       = link_to t('about.terms'), terms_path
       = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
+      = link_to t('about.other_instances'), 'https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md'
 
     = link_to t('about.get_started'), new_user_registration_path, class: 'button webapp-btn'
     = link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn'
diff --git a/app/views/admin/settings/index.html.haml b/app/views/admin/settings/index.html.haml
index 5b482213b..1429dbd9e 100644
--- a/app/views/admin/settings/index.html.haml
+++ b/app/views/admin/settings/index.html.haml
@@ -17,6 +17,10 @@
       %td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: 'Enter a public e-mail address'
     %tr
       %td
+        %strong Site title
+      %td= best_in_place @settings['site_title'], :value, url: admin_setting_path(@settings['site_title'])
+    %tr
+      %td
         %strong Site description
         %br/
         Displayed as a paragraph on the frontpage and used as a meta tag.
@@ -33,4 +37,4 @@
         Displayed on extended information page
         %br/
         You can use HTML tags
-      %td= best_in_place @settings['site_extended_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_extended_description'])
\ No newline at end of file
+      %td= best_in_place @settings['site_extended_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_extended_description'])
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e122e1c55..7eae6982b 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -13,7 +13,7 @@
 
     %title
       = "#{yield(:page_title)} - " if content_for?(:page_title)
-      Mastodon
+      = Setting.site_title
 
     = stylesheet_link_tag 'application', media: 'all'
     = csrf_meta_tags
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 412ec4fa5..32a50e158 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -1,10 +1,18 @@
+- content_for :page_title do
+  = "##{@tag.name}"
+
+.compact-header
+  %h1<
+    = link_to 'Mastodon', root_path
+    %small= "##{@tag.name}"
+
 - if @statuses.empty?
   .accounts-grid
     = render partial: 'accounts/nothing_here'
 - else
   .activity-stream.h-feed
-    = render partial: 'stream_entries/status', collection: @statuses, as: :status, cached: true
+    = render partial: 'stream_entries/status', collection: @statuses, as: :status
 
-.pagination
-  - if @statuses.size == 20
+- if @statuses.size == 20
+  .pagination
     = link_to safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), tag_url(@tag, max_id: @statuses.last.id), class: 'next_page', rel: 'next'