Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

Browse Source

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.

...

This commit is contained in:

Claire

2024-12-25 18:01:37 +01:00

parent 57c5905c19 8770905186

commit 0aa69487a2

759 changed files with 13447 additions and 7221 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

public/emoji/sheet_13.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 MiB After Width:  |  Height:  |  Size: 1.2 MiB

BIN

public/loading.gif Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 288 KiB

BIN

public/loading.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 73 KiB