Sfoglia il codice sorgente

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 anni fa
committed by Eugen Rochko
parent
commit
ef44c62d17
2 ha cambiato i file con 1 aggiunte e 7 eliminazioni
  1. +1
    -1
      app/helpers/instance_helper.rb
  2. +0
    -6
      spec/helpers/instance_helper_spec.rb

+ 1
- 1
app/helpers/instance_helper.rb Vedi 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 Vedi 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


Caricamento…
Annulla
Salva