Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
parent 2ca965c704 0b7a0d15c7
commit 071c2c9c85
122 changed files with 819 additions and 694 deletions
@@ -6,6 +6,6 @@ module InstanceHelper
  end

  def site_hostname
-    Rails.configuration.x.local_domain
+    @site_hostname ||= Addressable::URI.parse("//#{Rails.configuration.x.local_domain}").display_uri.host
  end
 end