Mastodon

History

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

2019-07-19 18:26:49 +02:00

account_actions

Add moderation warnings (#9519 )

2018-12-22 20:02:09 +01:00

account_moderation_notes

Improve admin UI for accounts (#7360 )

2018-05-05 23:06:29 +02:00

account_warnings

Add moderation warnings (#9519 )

2018-12-22 20:02:09 +01:00

accounts

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247 )