Erin Shepherd fe8b6e023a Merge remote-tracking branch 'catstodon/feature/emoji_reactions'		2023-07-02 22:08:46 +02:00
..
environments	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
initializers	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
locales	Merge remote-tracking branch 'catstodon/feature/emoji_reactions'	2023-07-02 22:08:46 +02:00
locales-glitch	Merge remote-tracking branch 'catstodon/feature/emoji_reactions'	2023-07-02 22:08:46 +02:00
routes	api.rb: Remove resources line that wasn't in routes.rb anymore	2023-05-27 12:01:13 +02:00
webpack	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream	2023-05-25 20:43:25 +02:00
application.rb	Remove tai locale (#23880)	2023-04-23 22:49:07 +02:00
boot.rb
brakeman.ignore
database.yml	Fix pgBouncer resetting application name on every transaction (#23958)	2023-03-05 01:52:42 +01:00
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
environment.rb
i18n-tasks.yml	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
navigation.rb	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
pghero.yml
puma.rb	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)	2023-03-14 14:47:57 +01:00
roles.yml
routes.rb	Add hCaptcha support (#25019)	2023-05-16 23:27:35 +02:00
secrets.yml
settings.yml	Introduce visible reactions default setting	2023-05-27 12:01:13 +02:00
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	2023-02-13 13:31:42 +01:00
storage.yml
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00