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

2019-04-10 21:19:21 +02:00
parent 92e1950194 5dd14dfded
commit 2f422b708f
81 changed files with 697 additions and 276 deletions
--- a/spec/lib/proof_provider/keybase/verifier_spec.rb
+++ b/spec/lib/proof_provider/keybase/verifier_spec.rb
@@ -10,7 +10,7 @@ describe ProofProvider::Keybase::Verifier do
      token: '11111111111111111111111111'
    )

-    described_class.new('alice', 'cryptoalice', '11111111111111111111111111')
+    described_class.new('alice', 'cryptoalice', '11111111111111111111111111', my_domain)
  end

  let(:query_params) do