mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 19:10:22 -05: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.
|
||
|---|---|---|
| .. | ||
| action_bar.js | ||
| autosuggest_account.js | ||
| character_counter.js | ||
| compose_form.js | ||
| emoji_picker_dropdown.js | ||
| navigation_bar.js | ||
| poll_button.js | ||
| poll_form.js | ||
| privacy_dropdown.js | ||
| reply_indicator.js | ||
| search_results.js | ||
| search.js | ||
| text_icon_button.js | ||
| upload_button.js | ||
| upload_form.js | ||
| upload_progress.js | ||
| upload.js | ||
| warning.js | ||