diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-28 18:45:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 18:45:28 +0100 |
| commit | fad29fd23052cdf3d51a6e0eb03557554572d402 (patch) | |
| tree | 4ba415e02d601654867889da11391b509909635d /app/lib/proof_provider/keybase/config_serializer.rb | |
| parent | bb316faffff7a76bc89f7e942233f0e14caf60f5 (diff) | |
| parent | ce7d055d3cc7927a597c8bb56b45f8e0aae91319 (diff) | |
Merge pull request #973 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/proof_provider/keybase/config_serializer.rb')
| -rw-r--r-- | app/lib/proof_provider/keybase/config_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/proof_provider/keybase/config_serializer.rb b/app/lib/proof_provider/keybase/config_serializer.rb index 557bafe84..5241d201f 100644 --- 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 |