Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ...

Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.

2024-03-11 17:29:07 +01:00

..

chewy

Add new public status index (#26344)

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

config/initializers/rack

Use unchanging github links in docs/comments (#29545)

2024-03-11 15:14:55 +00:00

controllers

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

fabrication

Ensure unique values in fabricators (#29515)

2024-03-11 08:53:24 +00:00

fabricators

Ensure unique values in fabricators (#29515)

2024-03-11 08:53:24 +00:00

features

Reduce RSpec/MultipleExpectations in captcha feature spec (#29226)

2024-02-16 07:52:57 +00:00

fixtures

Add end-to-end test for OCR in media uploads (#29148)

2024-02-08 19:13:44 +00:00

generators

Fix flaky tests related to file creation (#28248)

2023-12-06 22:22:25 +00:00

helpers

Merge pull request from GHSA-jhrq-qvrm-qr36

2024-02-16 12:17:15 +01:00

lib

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

locales

…

mailers

Add notification email on invalid second authenticator (#28822)

2024-01-22 13:55:43 +00:00

models

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

policies

Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream

2024-01-15 20:53:16 +01:00

presenters

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00

requests

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

routing

…

search/models/concerns/account

Use Sidekiq fake! instead of inline! in specs (#25369)

2024-01-10 11:06:58 +00:00

serializers

Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)

2024-02-06 17:10:17 +00:00

services

Add notification policies and notification requests (#29366)

2024-03-07 14:53:37 +00:00

support

Add basic end-to-end test for admin moderation interface (#29424)

2024-02-27 15:18:06 +00:00

system

Add basic end-to-end test for admin moderation interface (#29424)

2024-02-27 15:18:06 +00:00

validators

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

2024-02-24 14:46:14 +01:00

views

Fix RSpec/MetadataStyle cop in spec/ (#27729)

2023-11-06 14:28:20 +00:00

workers

Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream

2024-02-24 15:02:28 +01:00

rails_helper.rb

Use capture_emails helper to improve email assertions in specs (#29245)

2024-02-19 15:57:47 +00:00

spec_helper.rb

Change registrations to be disabled by default for new servers (#29280)

2024-02-22 13:28:19 +00:00