mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-11 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/statuses
History
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02: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 Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +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 Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
_poll.html.haml Fix haml-lint Rubocop Style/NumericPredicate cop (#26040) 2023-07-20 15:13:06 +02:00
_simple_status.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
_status.html.haml Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02: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 Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00