This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Eugen Rochko bf3cb42da7 Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) ... Cherry-picked d2528b26b6 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.		2022-10-09 19:51:39 +02: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	2022-08-28 11:31:00 +02:00
api	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
filters	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2022-08-31 11:55:27 +02:00
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
well_known	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
about_controller.rb	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02: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
directories_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +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-10-02 18:46:22 +02:00
following_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
health_controller.rb	Change health check (#15988)	2021-04-03 02:39:04 +02:00
home_controller.rb	[Glitch] Allow non-logged users to access /web	2022-10-09 18:23:15 +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	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
privacy_controller.rb	Fix /privacy-policy not using the appropriate resource packs (#1853)	2022-10-07 11:35:31 +02:00
public_timelines_controller.rb	…
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-12 22:13:57 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
tags_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00