Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		2020-06-09 10:39:20 +02:00
..
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb
domain_validator.rb
ed25519_key_validator.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
ed25519_signature_validator.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
email_mx_validator.rb
existing_username_validator.rb
follow_limit_validator.rb
html_validator.rb
note_length_validator.rb
poll_validator.rb	Improve polls: option lengths & redesign (#13257)	2020-04-02 17:10:55 +02:00
reaction_validator.rb	Fix validations of reactions limit (#12955)	2020-01-25 16:00:29 +01:00
status_length_validator.rb
status_pin_validator.rb
unique_username_validator.rb	Search account domain in lowercase (#13016)	2020-02-01 15:42:24 +01:00
unreserved_username_validator.rb
url_validator.rb
vote_validator.rb