mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 11:53:41 +01:00
a7aedebc31
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. |
||
|---|---|---|
| .. | ||
| importer | ||
| push_notifications | ||
| account_notes.js | ||
| accounts.js | ||
| alerts.js | ||
| announcements.js | ||
| app.js | ||
| blocks.js | ||
| bookmarks.js | ||
| bundles.js | ||
| columns.js | ||
| compose.js | ||
| conversations.js | ||
| custom_emojis.js | ||
| directory.js | ||
| domain_blocks.js | ||
| dropdown_menu.js | ||
| emojis.js | ||
| favourites.js | ||
| filters.js | ||
| height_cache.js | ||
| identity_proofs.js | ||
| interactions.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 | ||
| settings.js | ||
| statuses.js | ||
| store.js | ||
| streaming.js | ||
| suggestions.js | ||
| timelines.js | ||
| trends.js | ||