ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
rebase/4.0.0rc2
Akihiko Odaki 2018-03-05 04:29:49 +09:00 committed by Eugen Rochko
parent 219aac7800
commit ef44c62d17
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/instance_helper.rb
View File

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

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' expect(helper.site_title).to eq 'New site title'
end 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 end
describe 'site_hostname' do describe 'site_hostname' do