Baptiste Lemoine b872c1c7c0 Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js		2020-02-12 10:03:28 +01:00
..
account_controller_concern_spec.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
accountable_concern_spec.rb	Add spec for AccountableConcern#log_action (#9559)	2018-12-18 16:43:03 +01:00
challengable_concern_spec.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
export_controller_concern_spec.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
localized_spec.rb	Change locale detection to run once per session (#8657)	2019-07-21 18:08:02 +02:00
rate_limit_headers_spec.rb	Rate limit by user instead of IP when API user is authenticated (#5923)	2017-12-09 14:20:02 +01:00
signature_verification_spec.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
user_tracking_concern_spec.rb	Fix regeneration marker not expiring (#6290)	2018-01-18 20:29:56 +01:00