mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/controllers
History
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
 		2023-02-19 10:42:55 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
disputes Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
filters Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
oauth Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 21:56:05 +01:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
well_known
…
about_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
application_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
authorize_interactions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
custom_css_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
emojis_controller.rb
…
filters_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
follower_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
following_accounts_controller.rb Fix single name variables on controller folder (#20092) 2022-12-15 17:11:58 +01:00
health_controller.rb
…
home_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +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 2022-12-15 20:25:25 +01:00
media_proxy_controller.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
privacy_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships_controller.rb
…
shares_controller.rb
…
statuses_cleanup_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
tags_controller.rb Autofix Rubocop Style/TrailingCommaInArguments (#23694) 2023-02-18 12:39:58 +01:00