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

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.

2022-04-06 21:10:23 +02:00

..

activitypub

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

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

admin

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

2022-04-06 21:10:23 +02:00

api

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

2022-04-06 21:10:23 +02:00

auth

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

2022-04-06 21:10:23 +02:00

concerns

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

2022-04-06 21:10:23 +02:00

disputes

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

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

oauth

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

2020-09-28 14:13:30 +02:00

settings

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

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

well_known

Remove Keybase integration (#17045)

2021-11-26 05:58:18 +01:00

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

Restful refactor of accounts/ routes (#2133)

2017-04-19 13:52:37 +02:00

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

Remove set-cookie header on custom.css (#16314)

2021-05-30 17:57:47 +02:00

directories_controller.rb

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

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

emojis_controller.rb

Add (back) rails-level JSON caching (#11333)

2019-07-21 22:32:16 +02:00

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 '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

Change health check (#15988)

2021-04-03 02:39:04 +02:00

home_controller.rb

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

2021-09-26 18:28:59 +02:00

instance_actors_controller.rb

Fix instance actor not being dereferenceable (#17457)

2022-02-06 15:31:03 +01:00

intents_controller.rb

Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00

invites_controller.rb

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

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

manifests_controller.rb

Fix redirecting non-functional accounts on public pages (#11978)

2019-09-28 01:33:27 +02:00

media_controller.rb

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

2021-10-13 15:50:24 +02:00

media_proxy_controller.rb

Fix media proxy RedisLocks auto-releasing too fast (#16291)

2021-05-22 15:00:33 +02:00

public_timelines_controller.rb

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

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

relationships_controller.rb

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

2020-11-12 22:13:57 +01:00

remote_follow_controller.rb

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

2019-09-30 12:23:57 +02:00

remote_interaction_controller.rb

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

2020-06-24 15:33:41 +02:00

shares_controller.rb

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

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

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

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

tags_controller.rb

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

2020-09-08 16:26:47 +02:00