Claire 555e33a392 Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict because of our different theming systems.
  Updated accordingly, along with `app/helpers/theme_helper.rb`
  and `app/helpers/theme_helper_spec.rb`.

2024-05-01 18:38:55 +02:00

..

chewy

…

config/initializers/rack

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

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

controllers

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

2024-03-14 17:27:16 +01:00

fabrication

Ensure unique values in fabricators (#29515)

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

fabricators

Fix results/query in api/v1/featured_tags/suggestions (#29597)

2024-03-22 15:08:27 +00:00

features

Improve specs for severed relationships (#29688)

2024-03-22 16:25:36 +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 commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream

2024-05-01 18:38:55 +02:00

lib

Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream

2024-05-01 17:30:52 +02:00

locales

…

mailers

Add stub for trending tags in user mailer spec (#29850)

2024-04-05 07:48:07 +00:00

models

Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream

2024-05-01 17:30:52 +02: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 '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream

2024-05-01 17:30:52 +02:00

routing

…

search/models/concerns/account

Use enum-generated public_visibility scope on Status (#28156)

2024-03-14 09:31:57 +00:00

serializers

Add max_pinned_statuses to instances serializer and api response (#29441)

2024-04-02 13:54:11 +00:00

services

Undo notification permissions on individual and domain blocks (#29570)

2024-03-26 14:46:38 +00:00

support

Update dependency selenium-webdriver to v4.19.0 (#29776)

2024-04-02 08:53:44 +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 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream

2024-03-13 20:14:18 +01:00

views

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

workers

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

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

rails_helper.rb

Use before_all block to setup requests/cache_spec data (#29437)

2024-03-13 08:38:57 +00:00

spec_helper.rb

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

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