luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 11:53:13 +00:00
Code Issues Projects Releases Wiki Activity

Fallback to site_hostname when site_title is empty (#4394)

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2017-07-27 22:13:49 +09:00 committed by Eugen Rochko
parent 5bf4838e2f
commit bb96ba13cf
2 changed files with 2 additions and 2 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.to_s Setting.site_title.presence || site_hostname
end end
def site_hostname def site_hostname

2
spec/helpers/instance_helper_spec.rb
View file

@ -19,7 +19,7 @@ describe InstanceHelper do
it 'returns empty string when Setting.site_title is nil' do it 'returns empty string when Setting.site_title is nil' do
Setting.site_title = nil Setting.site_title = nil
expect(helper.site_title).to eq '' expect(helper.site_title).to eq 'cb6e6126.ngrok.io'
end end
end end