rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/controllers
History
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 		2024-05-06 17:53:51 +02:00
..
activitypub Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 2024-05-01 19:30:41 +02:00
admin Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 2024-05-06 17:53:51 +02:00
api Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 2024-05-06 17:53:51 +02:00
auth Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
concerns Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 2024-05-01 19:38:34 +02:00
disputes Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
filters Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
oauth Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
redirect Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
settings Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 2024-05-01 19:38:34 +02:00
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 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 2024-05-01 19:30:41 +02:00
application_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
authorize_interactions_controller.rb
…
backups_controller.rb
…
custom_css_controller.rb
…
emojis_controller.rb
…
filters_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
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
…
invites_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
mail_subscriptions_controller.rb
…
manifests_controller.rb
…
media_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
media_proxy_controller.rb
…
privacy_controller.rb
…
relationships_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
remote_interaction_helper_controller.rb
…
severed_relationships_controller.rb Use existing `SeveredRelationship.about_local_account` scope in more places (#29673) 2024-03-21 08:36:49 +00:00
shares_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
statuses_cleanup_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
statuses_controller.rb Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
tags_controller.rb
…