rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/controllers
History
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 		2024-03-19 19:21:12 +01:00
..
activitypub Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
admin Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 2024-03-11 17:29:07 +01:00
api Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 2024-03-19 19:21:12 +01:00
auth Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 2024-02-24 14:46:14 +01:00
concerns Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
disputes
…
filters
…
oauth
…
redirect
…
settings
…
well_known
…
about_controller.rb
…
accounts_controller.rb
…
application_controller.rb Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream 2024-03-13 20:14:18 +01:00
authorize_interactions_controller.rb
…
backups_controller.rb
…
custom_css_controller.rb Add scope `providing_styles` to `UserRole` (#29286) 2024-02-20 09:18:05 +00:00
emojis_controller.rb
…
filters_controller.rb
…
follower_accounts_controller.rb
…
following_accounts_controller.rb
…
health_controller.rb
…
home_controller.rb
…
instance_actors_controller.rb Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560) 2024-03-15 10:40:21 +00:00
intents_controller.rb Remove redundant `return` in `IntentsController` (#29099) 2024-02-06 12:56:22 +00:00
invites_controller.rb
…
mail_subscriptions_controller.rb
…
manifests_controller.rb
…
media_controller.rb
…
media_proxy_controller.rb
…
privacy_controller.rb
…
relationships_controller.rb
…
remote_interaction_helper_controller.rb
…
shares_controller.rb
…
statuses_cleanup_controller.rb
…
statuses_controller.rb
…
tags_controller.rb
…