luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-02-01 01:18:17 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin
History
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream 
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.
2020-09-28 14:13:30 +02:00
..
account_actions Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
account_warnings
accounts Fix method of the DELETE DATA button (#14855) 2020-09-21 20:37:19 +02:00
action_logs Fix admin audit log crash due to glitch-soc theming changes 2020-04-04 23:15:08 +02:00
announcements
change_emails
custom_emojis
dashboard
domain_allows
domain_blocks
email_domain_blocks
instances
invites
pending_accounts
relationships
relays
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports
settings Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
statuses
tags
warning_presets