squashed identity proof updates (#10375)

2019-03-28 13:01:09 -04:00
parent 026dd75208
commit 69141dca26
20 changed files with 214 additions and 25 deletions
--- a/app/lib/proof_provider/keybase/config_serializer.rb
+++ b/app/lib/proof_provider/keybase/config_serializer.rb
@ -14,7 +14,7 @@ class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
  end

  def domain
-    Rails.configuration.x.local_domain
+    ProofProvider::Keybase::DOMAIN
  end

  def display_name
@ -66,6 +66,6 @@ class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
  end

  def contact
-    [Setting.site_contact_email.presence].compact
+    [Setting.site_contact_email.presence || 'unknown'].compact
  end
 end