mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-23 14:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/statuses
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
..
_attachment_list.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
_detailed_status.html.haml Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +01:00
_og_description.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
_og_image.html.haml Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +01:00
_poll.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
_simple_status.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
_status.html.haml Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288) 2022-01-23 15:52:58 +01:00
embed.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
show.html.haml add og:published_time to opengraph meta tags (#14865) 2020-09-24 23:32:13 +02:00