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-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-11 08:20:44 +00:00
2024-12-18 07:51:31 +00:00
2024-12-19 08:47:20 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2024-12-19 08:47:20 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 12:36:32 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-19 08:47:20 +00:00
2024-12-19 08:47:20 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2023-10-31 16:05:44 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-20 08:06:18 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2023-06-02 15:00:27 +02:00
2024-09-11 13:59:46 +00:00
2024-12-18 07:51:31 +00:00
2024-12-19 08:47:20 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-02 08:27:19 +00:00
2024-12-19 08:47:20 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2023-07-13 14:22:20 +02:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-02 08:27:19 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-20 08:06:18 +00:00
2024-12-19 08:47:20 +00:00
2024-12-18 07:51:31 +00:00
2024-12-19 08:47:20 +00:00
2024-12-02 08:27:19 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2024-12-17 09:33:42 +00:00
2024-12-02 08:27:19 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2023-12-05 16:07:53 +00:00
2024-12-18 07:51:31 +00:00
2024-12-19 08:47:20 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-19 08:47:20 +00:00