diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-07-27 22:13:49 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-27 15:13:49 +0200 |
| commit | bb96ba13cf78c0bee1919c32e61bf0644c89a209 (patch) | |
| tree | 172a4bd0a097c7772050fd40dfe2a83207d9a12c | |
| parent | 5bf4838e2f77430a0f3f72a6d9eb431930a03abd (diff) | |
Fallback to site_hostname when site_title is empty (#4394)
| -rw-r--r-- | app/helpers/instance_helper.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/instance_helper_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb index a1c3c3521..70027cca9 100644 --- a/app/helpers/instance_helper.rb +++ b/app/helpers/instance_helper.rb @@ -2,7 +2,7 @@ module InstanceHelper def site_title - Setting.site_title.to_s + Setting.site_title.presence || site_hostname end def site_hostname diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb index c3d28544f..bc5950d91 100644 --- a/spec/helpers/instance_helper_spec.rb +++ b/spec/helpers/instance_helper_spec.rb @@ -19,7 +19,7 @@ describe InstanceHelper do it 'returns empty string when Setting.site_title is nil' do Setting.site_title = nil - expect(helper.site_title).to eq '' + expect(helper.site_title).to eq 'cb6e6126.ngrok.io' end end |