You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/controllers
Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
5 years ago
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
admin Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
api Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
auth Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
concerns Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
oauth Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
settings Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
well_known Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
account_follow_controller.rb Add specific rate limits for posting and following (#13172) 6 years ago
account_unfollow_controller.rb
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
authorize_interactions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
custom_css_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 6 years ago
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
emojis_controller.rb
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
following_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 6 years ago
media_controller.rb Fix functional user requirements in whitelist mode (#14093) 5 years ago
media_proxy_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 6 years ago
public_timelines_controller.rb
relationships_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
remote_follow_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
shares_controller.rb
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago