luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
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
..
challenges_controller.rb
confirmations_controller.rb Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
omniauth_callbacks_controller.rb Allow login through OpenID Connect (#16221) 2022-03-09 12:07:35 +01:00
passwords_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
registrations_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
sessions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
setup_controller.rb