mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 17:44:14 -05: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. |
||
|---|---|---|
| .. | ||
| importer | ||
| push_notifications | ||
| account_notes.js | ||
| accounts.js | ||
| alerts.js | ||
| announcements.js | ||
| app.js | ||
| blocks.js | ||
| bookmarks.js | ||
| boosts.js | ||
| bundles.js | ||
| columns.js | ||
| compose.js | ||
| conversations.js | ||
| custom_emojis.js | ||
| directory.js | ||
| domain_blocks.js | ||
| dropdown_menu.js | ||
| emojis.js | ||
| favourites.js | ||
| featured_tags.js | ||
| filters.js | ||
| height_cache.js | ||
| history.js | ||
| interactions.js | ||
| languages.js | ||
| lists.js | ||
| markers.js | ||
| modal.js | ||
| mutes.js | ||
| notifications.js | ||
| onboarding.js | ||
| picture_in_picture.js | ||
| pin_statuses.js | ||
| polls.js | ||
| reports.js | ||
| search.js | ||
| server.js | ||
| settings.js | ||
| statuses.js | ||
| store.js | ||
| streaming.js | ||
| suggestions.js | ||
| tags.js | ||
| timelines.js | ||
| trends.js | ||