monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers
History
Claire 18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
 		2024-08-22 19:54:20 +02:00
..
activitypub
…
admin Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
api Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 2024-08-22 19:54:20 +02:00
auth Fix log out from user menu not working on Safari (#31402) 2024-08-13 17:49:23 +00:00
concerns Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 2024-08-02 18:09:48 +02:00
disputes
…
filters
…
oauth Merge pull request from GHSA-vp5r-5pgw-jwqx 2024-07-04 16:11:28 +02:00
redirect
…
settings
…
well_known Implement RFC 8414 for OAuth 2.0 server metadata (#29191) 2024-05-06 13:17:56 +00:00
about_controller.rb
…
accounts_controller.rb
…
application_controller.rb Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
authorize_interactions_controller.rb
…
backups_controller.rb
…
custom_css_controller.rb
…
emojis_controller.rb
…
filters_controller.rb
…
follower_accounts_controller.rb
…
following_accounts_controller.rb
…
health_controller.rb
…
home_controller.rb
…
instance_actors_controller.rb
…
intents_controller.rb
…
invites_controller.rb
…
mail_subscriptions_controller.rb Fix contrast between background and form elements on some pages (#31266) 2024-08-02 13:55:31 +00:00
manifests_controller.rb
…
media_controller.rb
…
media_proxy_controller.rb
…
privacy_controller.rb
…
relationships_controller.rb
…
remote_interaction_helper_controller.rb
…
severed_relationships_controller.rb
…
shares_controller.rb
…
statuses_cleanup_controller.rb
…
statuses_controller.rb
…
tags_controller.rb
…