Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00
parent 43a9a781a4 ff44b2e92d
commit 447d7e6127
206 changed files with 2401 additions and 737 deletions
--- a/spec/helpers/instance_helper_spec.rb
+++ b/spec/helpers/instance_helper_spec.rb
@@ -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