367 Commits (276954bfd046ae5d5dfad1a81b8b33b5a2b3baa8)

Author	SHA1	Message	Date
Kouhai	276954bfd0	th: sure. why not. let's interpolate DB_HOST.	1 year ago
kouhai	b24d7bb6f2	th: Merge remote-tracking branch 'glitch/main' (18eacc7a07)	1 year ago
Claire	4a9cdfb928	Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	774e1189d2	Change `eslint` config to autofix missing comma and indentation in JS files (#26711)	1 year ago
Claire	e9a181c52c	Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream	1 year ago
Emelia Smith	f68d540271	Fix websocket connections being incorrectly decremented twice on errors (#27238)	1 year ago
Kouhai	d22e3b86f2	th: fix streaming	1 year ago
Kouhai	150feaf9b7	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Claire	22ee4e057d	Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Upstream has added a parameter to `streamFrom`, while glitch-soc had an extra parameter. Ported upstream changes.	1 year ago
Claire	6b89ab368c	Merge commit '4ae247954387b530b532eaa89ca017a17cbe63bd' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Upstream has added a parameter to `streamFrom`, while glitch-soc had an extra parameter. Ported upstream changes.	1 year ago
Emelia Smith	fbfceb9c77	Add additional metrics for streaming (#26945)	1 year ago
Emelia Smith	c1b1cbb58a	Add additional metrics for streaming (#26945)	1 year ago
Kouhai	9d32bdbcde	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Claire	4ed629cd7e	Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.	1 year ago
Claire	63969b15b3	Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.	1 year ago
Gabriel Simmer	be991f1d18	Move to ioredis for streaming (#26581) ... Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>	1 year ago
Gabriel Simmer	8bffce5f01	Move to ioredis for streaming (#26581) ... Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>	1 year ago
Kouhai	7c7355a964	th: Merge remote-tracking branch 'glitch/main' (d033fab0ed)	1 year ago
Claire	1b5d3fdc5e	Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream	1 year ago
Claire	6fba17f6f3	Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream	1 year ago
Emelia Smith	6375e390af	Fix: support both DATABASE_URL and DB_PASS (#26295)	1 year ago
Emelia Smith	c2ef995baa	Fix: support both DATABASE_URL and DB_PASS (#26295)	1 year ago
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Claire	33024cca51	Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Kouhai	f8028d190e	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Emelia Smith	65096c1ccd	Change streaming `/metrics` to include additional metrics (#26299)	1 year ago
Emelia Smith	b92b2b1298	Change streaming `/metrics` to include additional metrics (#26299)	1 year ago
Claire	84bc751433	Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.	1 year ago
Claire	92fa9d34b0	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.	1 year ago
Claire	68d080177a	Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream	1 year ago
Claire	454d8567d4	Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	6a19d5ce99	Fix missing return values in streaming (#26233)	1 year ago
Renaud Chaput	3554c52795	Fix missing return values in streaming (#26233)	1 year ago
Claire	d21fa55246	Swap debug statements in streaming server (#26231)	1 year ago
Claire	446821a0dc	Swap debug statements in streaming server (#26231)	1 year ago
Emelia Smith	813acdb431	Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228)	1 year ago
Emelia Smith	81cdc0f972	Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228)	1 year ago
Emelia Smith	0ee5d7a804	Refactor streaming's filtering logic & improve documentation (#26213)	1 year ago
Emelia Smith	ddaf200c78	Refactor streaming's filtering logic & improve documentation (#26213)	1 year ago
Claire	eb1139fd42	Fix wrong filters sometimes applying in streaming (#26159)	1 year ago
Claire	1814990a3d	Fix wrong filters sometimes applying in streaming (#26159)	1 year ago
Kouhai	fa0f31a8fb	th: merge glitch again (lol)	1 year ago
Kouhai	93de89e597	th: 12-factor ~~authentication~~ apps were a mistake	1 year ago
Claire	f101b67a45	Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream	1 year ago
Claire	65cbcce997	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	1 year ago
Claire	1c25f35ddf	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.	1 year ago
Claire	42a0898f16	Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.	1 year ago
Emelia Smith	34c9ee4a66	Add logging of websocket send errors (#25280)	1 year ago
Emelia Smith	215081240f	Add logging of websocket send errors (#25280)	1 year ago
Emelia Smith	90070920bf	Fix logging of messages that are binary before closing their connection (#25361)	1 year ago