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.rb	Add ActivityPub secure mode (#11269)	2019-07-11 20:11:09 +02:00
account_owned_concern.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
accountable_concern.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
authorization.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
cache_concern.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
challengable_concern.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
export_controller_concern.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
localized.rb	Change locale detection to run once per session (#8657)	2019-07-21 18:08:02 +02:00
rate_limit_headers.rb	Apply a 25x rate limit by IP even to authenticated requests (#5948)	2017-12-11 15:32:29 +01:00
session_tracking_concern.rb	Update session activation time (fixes #5605) (#7408)	2018-05-11 13:20:58 +02:00
signature_authentication.rb	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)	2018-02-02 10:19:59 +01:00
signature_verification.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
status_controller_concern.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
user_tracking_concern.rb	Fix #6331 (#6341)	2018-01-23 20:52:30 +01:00