Do not default site_title with site_hostname in InstanceHelper (#6624)

site_title is "Mastodon" by default configuration, and there is no need to
default site_title with site_hostname in InstanceHelper.

diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb
index 22a19c52b570400ba22453f890d73839997b49cc..dd0b25f3ef9ec5096b47e6616e398e615ee68465 100644 (file)
--- a/app/helpers/instance_helper.rb
+++ b/app/helpers/instance_helper.rb
@@ -2,7 +2,7 @@
 
 module InstanceHelper
   def site_title
-    Setting.site_title.presence || site_hostname
+    Setting.site_title
   end
 
   def site_hostname

diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb
index bc5950d91ce1e9f0713ec6534bff7e6ef2f8f2b8..c2e26dbed373f383b86235e3b893fa221cdb72f7 100644 (file)
--- a/spec/helpers/instance_helper_spec.rb
+++ b/spec/helpers/instance_helper_spec.rb
@@ -15,12 +15,6 @@ describe InstanceHelper do
 
       expect(helper.site_title).to eq 'New site title'
     end
-
-    it 'returns empty string when Setting.site_title is nil' do
-      Setting.site_title = nil
-
-      expect(helper.site_title).to eq 'cb6e6126.ngrok.io'
-    end
   end
 
   describe 'site_hostname' do