Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00
parent bda1782cd8 1c1042556d
commit 3ab6a8b8be
9 changed files with 174 additions and 104 deletions
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@ -21,9 +21,9 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
                                hero: nil,
                                user_count: 0,
                                status_count: 0,
-                                closed_registrations_message: 'yes',
-                                commit_hash: commit_hash)
-
+                                commit_hash: commit_hash,
+                                contact_account: nil,
+                                closed_registrations_message: 'yes')
    assign(:instance_presenter, instance_presenter)
    render