diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:56:58 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:56:58 -0500 |
| commit | 3ab6a8b8bed37d048909b178693af8411325eb38 (patch) | |
| tree | db371121cbfb240d1338e803dff136f3023c2b87 /spec | |
| parent | bda1782cd864ed3aabb5a4d87359a1cb7595f4a6 (diff) | |
| parent | 1c1042556d21e4c2eb22b7c5cbc11aa88087ca60 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/views/about/show.html.haml_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb index be1320ed3..0f4d79569 100644 --- 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 |