Mastodon

History

Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01:00

blacklisted_email_validator.rb

Implement EmailBlackList (#5109 )

2017-10-04 15:16:10 +02:00

disallowed_hashtags_validator.rb

Implement the ability for instances to define a list of disallowed hashtags (#7176 )

2018-04-23 23:52:58 +02:00

email_mx_validator.rb

Improve e-mail MX validator and add tests (#9489 )

2018-12-10 22:53:25 +01:00

follow_limit_validator.rb

Fix follow limit validator reporting lower number past threshold (#9230 )