Browse Source

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.
master
Akihiko Odaki 6 years ago
committed by Eugen Rochko
parent
commit
ef44c62d17
2 changed files with 1 additions and 7 deletions
  1. +1
    -1
      app/helpers/instance_helper.rb
  2. +0
    -6
      spec/helpers/instance_helper_spec.rb

+ 1
- 1
app/helpers/instance_helper.rb View File

@ -2,7 +2,7 @@
module InstanceHelper
def site_title
Setting.site_title.presence || site_hostname
Setting.site_title
end
def site_hostname

+ 0
- 6
spec/helpers/instance_helper_spec.rb View File

@ -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

Loading…
Cancel
Save