Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
Conflicts:
- `app/javascript/entrypoints/common.js`:
Upstream moved everything from `app/javascript/packs` to
`app/javascript/entrypoints` while this file was a glitch-soc
addition. Moved it like the rest.
- `tsconfig.json`:
Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
Conflicts:
- `app/helpers/application_helper.rb`:
Conflict because of our different theming systems.
Updated accordingly, along with `app/helpers/theme_helper.rb`
and `app/helpers/theme_helper_spec.rb`.
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`
All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.
Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
