Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: config/settings.yml
2018-08-01 22:20:25 +02:00
parent 71b318dedc 4da03a298a
commit bf1d3ae3b8
11 changed files with 16 additions and 6 deletions
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -13,6 +13,7 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
  it 'has valid open graph tags' do
    instance_presenter = double(:instance_presenter,
                                site_title: 'something',
+                                site_short_description: 'something',
                                site_description: 'something',
                                version_number: '1.0',
                                source_url: 'https://github.com/tootsuite/mastodon',