queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers
History
Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.
2022-04-06 21:10:23 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
disputes Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
oauth
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
well_known Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
about_controller.rb Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
application_controller.rb Move glitch-soc-specific theming methods to ThemingConcern 2022-02-05 10:58:51 +01:00
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
following_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
health_controller.rb
home_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-09-26 18:28:59 +02:00
instance_actors_controller.rb Fix instance actor not being dereferenceable (#17457) 2022-02-06 15:31:03 +01:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
media_proxy_controller.rb
public_timelines_controller.rb
relationships_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb Fix account statuses cleanup settings controller for glitch-soc's theming system 2021-08-09 23:28:06 +02:00
statuses_controller.rb
tags_controller.rb