mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 23:54:52 +01:00
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
|
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| apps | ||
| crypto | ||
| featured_tags | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| accounts_controller.rb | ||
| announcements_controller.rb | ||
| apps_controller.rb | ||
| blocks_controller.rb | ||
| bookmarks_controller.rb | ||
| conversations_controller.rb | ||
| custom_emojis_controller.rb | ||
| directories_controller.rb | ||
| domain_blocks_controller.rb | ||
| endorsements_controller.rb | ||
| favourites_controller.rb | ||
| featured_tags_controller.rb | ||
| filters_controller.rb | ||
| follow_requests_controller.rb | ||
| instances_controller.rb | ||
| lists_controller.rb | ||
| markers_controller.rb | ||
| media_controller.rb | ||
| mutes_controller.rb | ||
| notifications_controller.rb | ||
| polls_controller.rb | ||
| preferences_controller.rb | ||
| reports_controller.rb | ||
| scheduled_statuses_controller.rb | ||
| statuses_controller.rb | ||
| streaming_controller.rb | ||
| suggestions_controller.rb | ||
| trends_controller.rb | ||