0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-08 21:46:48 +00:00
mastodon/app/views/admin
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
account_moderation_notes
account_warnings Add moderation warnings () 2018-12-22 20:02:09 +01:00
accounts Remove Atom feeds and old URLs in the form of GET /:username/updates/:id () 2019-07-07 16:16:51 +02:00
action_logs
change_emails
custom_emojis
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
domain_blocks
email_domain_blocks
followers
instances Remove expensive counters from federation page in admin UI () 2019-06-22 00:39:09 +02:00
invites
pending_accounts
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
statuses
tags
warning_presets