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
..
2024-06-26 13:51:11 +00:00
2024-06-21 14:43:12 +00:00
2024-06-21 14:43:12 +00:00
2024-06-21 14:43:12 +00:00
2024-12-11 14:25:48 +00:00
2024-06-21 14:43:12 +00:00
2024-09-03 15:32:22 +00:00
2024-12-11 14:25:48 +00:00
2024-12-16 13:50:58 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 15:50:50 +00:00
2024-12-11 14:25:48 +00:00
2024-12-12 10:44:58 +00:00
2024-06-26 13:51:11 +00:00
2024-12-11 14:25:48 +00:00
2024-06-21 14:43:12 +00:00
2024-10-01 13:56:43 +00:00
2024-06-26 13:51:44 +00:00
2024-06-26 13:51:11 +00:00
2024-12-11 15:50:50 +00:00
2024-10-01 13:56:43 +00:00
2024-12-11 14:25:48 +00:00
2024-09-02 14:19:55 +00:00
2024-10-01 13:56:43 +00:00
2024-09-03 15:32:22 +00:00
2024-09-03 15:32:22 +00:00
2024-09-03 15:32:22 +00:00
2024-12-12 08:15:38 +00:00
2024-10-09 18:36:19 +02:00
2024-12-12 08:15:38 +00:00
2024-09-03 15:32:22 +00:00
2024-10-09 18:36:19 +02:00
2024-10-01 13:56:43 +00:00
2024-10-01 13:56:43 +00:00
2024-12-12 10:44:58 +00:00
2024-12-11 14:25:48 +00:00
2024-10-01 13:56:43 +00:00
2024-12-11 14:25:48 +00:00
2024-12-12 10:44:58 +00:00
2024-12-11 14:25:48 +00:00
2024-12-12 08:15:38 +00:00
2024-12-12 08:15:38 +00:00
2024-12-11 14:25:48 +00:00
2024-12-12 08:15:38 +00:00
2024-12-11 14:25:48 +00:00
2024-09-02 14:19:55 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-11 14:25:48 +00:00
2024-12-05 14:34:14 +00:00
2024-10-01 13:56:43 +00:00
2024-12-11 15:50:50 +00:00
2024-10-01 13:56:43 +00:00
2024-12-11 14:25:48 +00:00
2024-06-03 08:35:59 +00:00
2024-06-03 08:35:59 +00:00
2024-05-29 01:34:33 +02:00
2024-06-07 13:45:11 +00:00
2024-06-07 13:45:11 +00:00
2024-06-07 13:45:11 +00:00
2024-06-07 13:45:11 +00:00
2024-07-16 13:23:08 +00:00
2024-07-16 13:23:08 +00:00
2024-07-26 08:53:10 +00:00
2024-08-09 13:30:55 +00:00
2024-12-18 12:25:40 +00:00
2024-09-10 12:00:40 +00:00
2024-10-07 07:46:03 +00:00
2024-10-23 13:26:51 +00:00
2024-10-28 04:55:18 +00:00
2024-11-04 10:11:06 +00:00
2024-12-04 11:59:17 +00:00
2024-12-09 10:04:46 +00:00
2024-12-06 10:58:18 +00:00
2024-12-06 08:29:54 +00:00
2024-12-06 08:29:54 +00:00
2024-12-10 15:50:49 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-14 00:16:03 +00:00
2024-12-16 08:20:08 +00:00
2024-12-16 08:20:08 +00:00
2024-12-16 08:20:08 +00:00
2024-12-16 08:20:08 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00
2024-12-20 14:33:48 +00:00
2024-12-20 14:33:48 +00:00
2024-12-20 14:33:48 +00:00
2024-12-20 14:33:48 +00:00
2024-12-17 13:38:18 +00:00
2024-12-17 13:38:18 +00:00