Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-11 11:55:42 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-10 09:41:49 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00
well_known	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
about_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
emojis_controller.rb
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-03 17:28:54 +01:00
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
instance_actors_controller.rb	Create instance actor if it hasn't been properly seeded (#15693)	2021-02-09 18:12:54 +01:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb	Fix embedded player	2020-08-12 00:00:42 +02:00
media_proxy_controller.rb	replace all instances of "ends_with?" with "end_with?" (#15745)	2021-02-19 09:56:14 +01: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	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
shares_controller.rb
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00