You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_detailed_status.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_og_image.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
_poll.html.haml	Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040)	1 year ago
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
_status.html.haml	Cleanup unused portions of statuses/status partial (#26045)	1 year ago
embed.html.haml	Fix error when trying to render component for media without meta (#16112)	4 years ago
show.html.haml	Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)	1 year ago