Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
This commit is contained in:
@@ -208,6 +208,10 @@ class Account < ApplicationRecord
|
||||
end
|
||||
end
|
||||
|
||||
def sign?
|
||||
true
|
||||
end
|
||||
|
||||
def keypair
|
||||
@keypair ||= OpenSSL::PKey::RSA.new(private_key || public_key)
|
||||
end
|
||||
|
Reference in New Issue
Block a user