Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream ...

Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.

2023-10-08 17:21:12 +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 haml-lint Rubocop Rails/* cops (#26042)

2023-10-03 15:00:40 +02: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