luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 04:07:45 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers
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
..
activitypub Spelling (#17705) 2022-03-06 22:51:40 +01:00
admin Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
auth Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
concerns Change public profile pages to be disabled for unconfirmed users (#17385) 2022-01-28 14:24:37 +01:00
disputes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
oauth
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
well_known
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
application_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
authorize_interactions_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
emojis_controller_spec.rb
follower_accounts_controller_spec.rb Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
following_accounts_controller_spec.rb Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
health_controller_spec.rb
home_controller_spec.rb
instance_actors_controller_spec.rb Fix instance actor not being dereferenceable (#17457) 2022-02-06 15:31:03 +01:00
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
media_proxy_controller_spec.rb
relationships_controller_spec.rb
remote_follow_controller_spec.rb
remote_interaction_controller_spec.rb
shares_controller_spec.rb
statuses_cleanup_controller_spec.rb
statuses_controller_spec.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
tags_controller_spec.rb