Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

2022-03-22 17:00:38 +01:00

..

activitypub

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-22 17:00:38 +01:00

admin

Fix blank screen when trying to copy emoji with a too large file size (#1718)

2022-03-14 17:34:53 +01:00

api

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-22 17:00:38 +01:00

auth

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-10 09:52:45 +01:00

concerns

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-02 18:02:48 +01:00

disputes

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-02 18:02:48 +01:00

oauth

…

settings

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

well_known

…

about_controller.rb

Change CAPTCHA handling to be only on email verification

2022-01-25 23:56:57 +01:00

account_follow_controller.rb

Add specific rate limits for posting and following (#13172)

2020-03-08 15:17:39 +01:00

account_unfollow_controller.rb

…

accounts_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-17 08:28:52 +01:00

application_controller.rb

Move glitch-soc-specific theming methods to ThemingConcern

2022-02-05 10:58:51 +01:00

authorize_interactions_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-03-08 19:38:53 +01:00

custom_css_controller.rb

…

directories_controller.rb

…

emojis_controller.rb

…

filters_controller.rb

…

follower_accounts_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

following_accounts_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

health_controller.rb

…

home_controller.rb

…

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

…

media_proxy_controller.rb

…

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

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-19 21:49:35 +02:00

statuses_cleanup_controller.rb

…

statuses_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00

tags_controller.rb

…