You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		5 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
concerns	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
about_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emojis_controller.rb	…
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
instance_actors_controller.rb	Create instance actor if it hasn't been properly seeded (#15693)	5 years ago
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	Fix embedded player	6 years ago
media_proxy_controller.rb	replace all instances of "ends_with?" with "end_with?" (#15745)	5 years ago
public_timelines_controller.rb	…
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_follow_controller.rb	…
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shares_controller.rb	…
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	5 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago