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:
commit
34b8346e7f
63 changed files with 239 additions and 535 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue