Claire
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
..
2023-06-22 14:55:22 +02:00
2023-06-14 15:21:36 +02:00
2023-06-18 13:41:33 +02:00
2023-06-10 18:38:22 +02:00
2023-06-14 16:44:37 +02:00
2023-05-19 17:13:29 +02:00
2023-07-28 23:15:33 +02:00
2023-06-06 13:58:33 +02:00
2023-06-06 13:58:33 +02:00
2023-04-26 21:29:36 +02:00
2023-07-12 09:49:33 +02:00
2023-07-20 18:23:48 +02:00
2023-06-14 16:44:37 +02:00
2023-02-20 13:24:14 +09:00
2023-03-04 16:43:47 +01:00
2023-03-04 17:16:45 +01:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-06-14 16:44:37 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-06-06 13:58:33 +02:00
2023-06-06 15:51:42 +02:00
2023-06-06 13:58:33 +02:00
2023-03-04 16:43:47 +01:00
2023-06-06 13:58:33 +02:00
2023-05-08 19:28:21 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-06-06 13:58:33 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-03-04 17:16:45 +01:00
2023-08-07 17:58:12 +02:00
2023-05-04 05:49:53 +02:00
2023-06-10 18:38:22 +02:00
2023-03-04 17:00:00 +01:00
2023-03-04 17:16:45 +01:00
2023-05-04 05:49:53 +02:00
2023-03-04 16:43:47 +01:00
2023-03-04 16:43:47 +01:00
2023-05-08 19:28:21 +02:00
2023-07-12 09:49:33 +02:00
2023-05-04 05:49:08 +02:00
2023-08-22 09:31:40 +02:00
2023-05-22 13:15:21 +02:00
2023-03-04 17:16:45 +01:00
2023-06-22 14:55:22 +02:00
2023-06-22 14:55:22 +02:00
2023-06-06 13:58:33 +02:00
2023-03-04 17:16:45 +01:00
2023-06-06 13:58:33 +02:00
2023-06-18 13:41:33 +02:00
2023-06-18 13:59:47 +02:00
2023-02-20 06:58:28 +01:00
2023-07-12 09:49:33 +02:00
2023-06-19 14:06:06 +01:00
2023-06-06 15:51:42 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00