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
..
admin	Migrate to request specs in `/api/v1/admin/account_actions` (#25514)	1 year ago
apps	Migrate to request specs in `/api/v1/apps/verify_credentials` (#25404)	1 year ago
emails	Migrate to request specs in `/api/v1/emails/confirmations` (#25686)	1 year ago
statuses	Wrong count in response when removing favourite/reblog (#24365)	1 year ago
timelines	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
accounts_show_spec.rb	migrate test for `GET /api/v1/accounts/{account_id}` to request spec (#25322)	1 year ago
apps_spec.rb	Migrate to request specs in `/api/v1/apps` (#25401)	1 year ago
bookmarks_spec.rb	Migrate to request specs in `/api/v1/bookmarks` (#25520)	1 year ago
domain_blocks_spec.rb	Migrate to request specs in `/api/v1/domain_blocks` (#25414)	1 year ago
featured_tags_spec.rb	Extract shared examples from api specs (#25387)	1 year ago
follow_requests_spec.rb	Migrate to request specs in `/api/v1/follow_requests` (#25411)	1 year ago
lists_spec.rb	Migrate to request specs in `/api/v1/lists` (#25443)	1 year ago
mutes_spec.rb	Migrate to request specs in `/api/v1/mutes` (#25622)	1 year ago
polls_spec.rb	Migrate to request specs in `/api/v1/polls` (#25596)	1 year ago
suggestions_spec.rb	Migrate to request specs in `/api/v1/suggestions` (#25540)	1 year ago
tags_spec.rb	Migrate to request specs in `/api/v1/tags` (#25439)	1 year ago