Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
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:
- `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.
Claire