luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 21:03:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/admin
History
Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream updated media and edit-related code textually close to glitch-soc
  additions (local-only and content-type).
  Ported upstream changes.
- `app/models/status_edit.rb`:
  Upstream changes textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (directMessage attribute).
  Ported upstream changes.
- `app/services/remove_status_service.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (DM timeline).
  Ported upstream changes.
- `app/services/update_status_service.rb`:
  Upstream fixed an issue with language selection. Not really a conflict,
  but textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `db/schema.rb`:
  Upstream added columns to the `status_edits` table, the conflict is because
  of an additional column (`content-type`) in glitch-soc.
  Ported upstream changes.
- `package.json`:
  Upstream dependency (express) textually adjacent to a glitch-soc-specific one
  (favico.js) got updated.
  Updated it as well.
2022-03-10 09:52:45 +01:00
..
disputes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Add ability to mark statuses as sensitive from reports in admin UI (#17668) 2022-03-01 22:20:29 +01:00
trends Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
account_actions_controller.rb
account_moderation_notes_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
accounts_controller.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
domain_allows_controller.rb
domain_blocks_controller.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
email_domain_blocks_controller.rb Fix error when a MX is shared across blocked domains (#17650) 2022-02-26 17:26:28 +01:00
follow_recommendations_controller.rb
instances_controller.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb Fix error on account relationships page in admin UI (#17444) 2022-02-05 05:06:34 +01:00
relays_controller.rb
report_notes_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
reports_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
resets_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
roles_controller.rb
rules_controller.rb
settings_controller.rb
sign_in_token_authentications_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
site_uploads_controller.rb
statuses_controller.rb Fix empty batch statuses selection causing a 500 error (#17532) 2022-02-12 19:52:17 +01:00
subscriptions_controller.rb
tags_controller.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
two_factor_authentications_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
warning_presets_controller.rb