Claire
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
..
2023-06-22 14:55:22 +02:00
2024-08-19 15:55:42 +00:00
2024-09-04 05:12:25 +00:00
2024-11-24 16:46:28 +01:00
2024-12-12 10:28:05 +00:00
2024-12-04 11:59:17 +00:00
2023-05-19 17:13:29 +02:00
2023-07-28 23:15:33 +02:00
2024-10-23 06:39:19 +00:00
2023-06-06 13:58:33 +02:00
2024-09-18 13:29:57 +00:00
2024-06-11 13:59:56 +00:00
2024-09-04 05:12:25 +00:00
2024-10-25 08:02:13 +00:00
2024-10-24 12:52:38 +00:00
2024-12-10 13:02:52 +00:00
2024-11-11 08:29:55 +00:00
2024-12-17 16:25:02 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:40 +00:00
2024-10-23 07:47:46 +00:00
2024-10-23 06:42:57 +00:00
2024-10-15 13:30:17 +00:00
2024-09-16 07:52:22 +00:00
2024-11-12 08:57:06 +00:00
2023-12-21 09:18:38 +00:00
2023-05-04 05:49:53 +02:00
2024-09-05 15:36:05 +00:00
2023-06-14 16:44:37 +02:00
2024-09-16 07:53:03 +00:00
2024-01-25 13:00:34 +00:00
2024-12-20 08:21:34 +00:00
2024-10-25 08:42:14 +00:00
2024-10-14 12:51:01 +00:00
2023-06-06 15:51:42 +02:00
2024-10-03 13:09:58 +00:00
2024-09-04 05:12:25 +00:00
2023-06-06 13:58:33 +02:00
2024-11-06 10:51:54 +00:00
2024-11-24 16:46:28 +01:00
2024-10-23 07:46:55 +00:00
2024-04-08 13:46:13 +00:00
2024-02-14 15:25:15 +01:00
2024-09-05 15:36:05 +00:00
2024-01-25 15:28:27 +00:00
2024-12-20 08:21:34 +00:00
2024-12-20 08:21:34 +00:00
2024-09-16 08:56:40 +00:00
2024-11-13 10:22:11 +00:00
2024-11-19 09:15:05 +00:00
2024-09-05 15:36:05 +00:00
2024-12-17 10:52:59 +00:00
2024-12-10 15:45:13 +00:00
2024-12-20 08:21:34 +00:00
2024-10-09 17:29:02 +00:00
2024-08-07 11:12:36 +00:00
2024-09-23 10:45:34 +00:00
2024-12-20 15:15:11 +00:00
2023-05-04 05:49:53 +02:00
2024-09-20 08:51:37 +00:00
2024-10-25 07:55:33 +00:00
2024-12-02 00:44:14 +00:00
2024-09-04 05:12:25 +00:00
2024-10-19 19:13:32 +02:00
2024-09-04 05:12:25 +00:00
2024-03-20 15:37:21 +00:00
2024-09-04 05:12:40 +00:00
2023-05-04 05:49:08 +02:00
2024-10-02 13:24:40 +00:00
2024-10-24 12:52:38 +00:00
2024-12-12 09:09:35 +00:00
2024-09-04 05:12:25 +00:00
2024-06-10 14:52:33 +00:00
2024-11-19 09:15:05 +00:00
2024-01-09 14:01:53 +00:00
2024-03-20 15:37:21 +00:00
2023-06-06 13:58:33 +02:00
2024-11-14 14:03:57 +00:00
2024-09-04 05:12:25 +00:00
2024-10-28 07:34:58 +00:00
2024-11-03 20:51:58 +01:00
2024-12-02 00:44:14 +00:00
2024-09-04 19:38:52 +02:00
2024-12-13 09:21:55 +00:00
2024-12-04 11:59:17 +00:00
2024-12-09 10:04:46 +00:00
2024-10-31 13:27:47 +00:00
2024-12-19 08:10:39 +00:00
2024-03-13 15:42:39 +00:00
2024-11-25 08:18:10 +00:00
2024-10-25 07:55:45 +00:00
2024-11-25 08:19:16 +00:00