mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 11:23:42 +01:00
12b935fadf
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream. |
||
|---|---|---|
| .. | ||
| about | ||
| account | ||
| account_gallery | ||
| account_timeline | ||
| audio | ||
| blocks | ||
| bookmarked_statuses | ||
| closed_registrations_modal | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| directory | ||
| domain_blocks | ||
| emoji | ||
| explore | ||
| favourited_statuses | ||
| favourites | ||
| filters | ||
| follow_requests | ||
| followed_tags | ||
| followers | ||
| following | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| interaction_modal | ||
| keyboard_shortcuts | ||
| list_adder | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| onboarding | ||
| picture_in_picture | ||
| pinned_statuses | ||
| privacy_policy | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| standalone/compose | ||
| status | ||
| subscribed_languages_modal | ||
| ui | ||
| video | ||