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

2022-02-12 21:36:33 +01:00

..

activitypub

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

2022-02-08 18:23:53 +01:00

admin

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

2022-02-12 21:36:33 +01:00

api

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

2022-02-12 11:12:41 +01:00

auth

Change CAPTCHA handling to be only on email verification

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

concerns

Add support for multiple source files per pack

2022-02-12 00:10:28 +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

2021-11-26 22:53:55 +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

…

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

…

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

…

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

2021-06-23 10:46:24 +02:00

following_accounts_controller.rb

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

2021-06-23 10:46:24 +02: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

…

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

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

2021-05-22 15:00:33 +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

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

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

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

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