masto-fe/app/controllers/concerns
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
account_controller_concern.rb Add ActivityPub secure mode () 2019-07-11 20:11:09 +02:00
account_owned_concern.rb Add whitelist mode () 2019-07-30 11:10:46 +02:00
accountable_concern.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
authorization.rb Add moderator role and add pundit policies for admin actions () 2017-11-11 20:23:33 +01:00
cache_concern.rb Introduce ApplicationController#cache_collection_paginated_by_id () 2020-08-28 12:31:56 +02:00
challengable_concern.rb Add password challenge to 2FA settings, e-mail notifications () 2019-09-18 16:37:27 +02:00
export_controller_concern.rb Add account migration UI () 2019-09-19 20:58:19 +02:00
localized.rb Fix not working I18n on 2FA and Sign in token page () 2020-06-20 13:30:13 +02:00
rate_limit_headers.rb Add specific rate limits for posting and following () 2020-03-08 15:17:39 +01:00
session_tracking_concern.rb Update session activation time (fixes ) () 2018-05-11 13:20:58 +02:00
sign_in_token_authentication_concern.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
signature_authentication.rb Allow retrieval of private statuses (single or in outbox) using HTTP signatures () 2018-02-02 10:19:59 +01:00
signature_verification.rb Add support for latest HTTP Signatures spec draft () 2020-08-24 18:21:07 +02:00
status_controller_concern.rb Refactor controllers for statuses, accounts, and more () 2019-07-08 12:03:45 +02:00
two_factor_authentication_concern.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
user_tracking_concern.rb Fix () 2018-01-23 20:52:30 +01:00