Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.

2023-10-24 18:41:20 +02:00

..

chewy

Add new public status index (#26344)

2023-08-24 16:40:04 +02:00

config/initializers

Speed-up on Rack::Attack spec (#25542)

2023-10-13 16:14:23 +02:00

controllers

Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

2023-10-19 19:14:04 +02:00

fabrication

Restore console behavior in test env (#26401)

2023-08-09 11:26:56 +02:00

fabricators

Add admin notifications for new Mastodon versions (#26582)

2023-09-01 17:47:07 +02:00

features

Fix Capybara/ClickLinkOrButtonStyle cop in spec/features/admin area (#27445)

2023-10-17 16:57:19 +02:00

fixtures

Remove unused stub json ld context (#25454)

2023-10-16 15:38:27 +02:00

generators

Clean up the post deployment migration generator (#24233)

2023-04-11 11:25:29 +02:00

helpers

Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

2023-10-19 19:14:04 +02:00

lib

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

locales

Replace i18n view spec with helper spec (#24966)

2023-05-15 17:25:04 +02:00

mailers

Add admin notifications for new Mastodon versions (#26582)

2023-09-01 17:47:07 +02:00

models

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

policies

Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream

2023-09-15 20:57:40 +02:00

presenters

Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream

2023-06-10 16:48:01 +02:00

requests

Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

2023-10-19 19:14:04 +02:00

routing

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

search/models/concerns

Add search tests (#26703)

2023-09-08 16:17:55 +02:00

serializers

Fix incorrect serialization of regional languages in contentMap (#27207)

2023-10-06 17:46:04 +02:00

services

Fix Lint/UselessAssignment cop (#27472)

2023-10-19 16:55:06 +02:00

support

Update rubocop-capybara to version 2.19.0 (#26982)

2023-10-17 16:10:50 +02:00

system

Update rubocop-capybara to version 2.19.0 (#26982)

2023-10-17 16:10:50 +02:00

validators

Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream

2023-10-17 21:42:49 +02:00

views

Configure brakeman to ignore url safe preview card urls (#25883)

2023-10-20 15:32:16 +02:00

workers

Speed-up on MoveWorker spec (#25528)

2023-10-13 15:50:46 +02:00

rails_helper.rb

Remove unused stub json ld context (#25454)

2023-10-16 15:38:27 +02:00

spec_helper.rb

Fix duplicate github annotations for rspec failures (#27450)

2023-10-18 10:18:34 +02:00