0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
8770905186
Convert `admin/ip_blocks` spec controller->system ( #33376 )
2024-12-20 15:36:19 +00:00
87c892191a
Convert `admin/domain_allows` spec controller->system ( #33365 )
2024-12-20 08:04:22 +00:00
1acc54cfc7
Convert `admin/webhooks` spec controller->system ( #33364 )
2024-12-20 07:52:16 +00:00
03bf4cde55
Convert `statuses_cleanup` controller specs to system specs ( #33363 )
2024-12-19 13:34:54 +00:00
545a6b9eed
Convert `admin/account_moderation_notes` spec controller->system ( #33354 )
2024-12-19 08:02:08 +00:00
668ce14ff2
Convert `admin/custom_emojis` spec controller->system ( #33327 )
2024-12-18 08:34:15 +00:00
d65e246192
Convert `statuses#activity` action controller to request spec ( #33336 )
2024-12-17 16:37:30 +00:00
60bb51eef8
Convert `filters` spec controller->system ( #33326 )
2024-12-17 09:20:01 +00:00
efe4e72f93
Convert `settings/preferences/appearance` controller spec to system ( #33323 )
2024-12-16 17:08:19 +00:00
9067a7f696
Convert `settings/preferences/notifications` controller spec to system ( #33322 )
2024-12-16 16:24:05 +00:00
bfef66276a
Convert `settings/preferences/other` controller spec to system ( #33321 )
2024-12-16 16:23:26 +00:00
c68eb82ffa
Use explicit config loading from `bin/rubocop` ( #33256 )
2024-12-16 13:50:58 +00:00
a596f3479b
Convert `settings/login_activities` controller spec to system spec ( #33306 )
2024-12-16 08:12:36 +00:00
3d00b95359
Convert `settings/profiles` controller spec to system spec ( #33305 )
2024-12-16 08:11:48 +00:00
4130bda12e
Convert `settings/verifications` controller spec to system spec ( #33285 )
2024-12-13 10:39:07 +00:00
f721e76d13
Avoid double request in `admin/export_domain_allows` controller spec ( #33255 )
2024-12-11 08:58:59 +00:00
39364346bb
Add coverage for admin/terms/drafts#update and admin/terms/generates#create actions ( #33251 )
2024-12-10 23:09:36 +00:00
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
9d3fcc3546
Remove unused failure action in api/base controller spec ( #32905 )
2024-11-15 16:10:20 +00:00
7bd7705f59
Combine shared-setup examples across `spec/controllers/auth/*` specs ( #32906 )
2024-11-15 16:07:26 +00:00
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
df3b954720
Add `DomainHelpers` spec support module for DNS/MX stub ( #32690 )
2024-10-29 15:35:25 +00:00
b107fc2e65
Use nil for timestamp column in admin/confirmations spec ( #32682 )
2024-10-29 08:54:30 +00:00
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
c40cd79c4d
Convert `admin/invites` controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
28131b4b00
Convert status embed controller to request spec ( #32448 )
2024-10-15 14:18:20 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
06d6b35e88
Convert `admin/tags` controller specs to system specs ( #32447 )
2024-10-14 08:31:12 +00:00
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
d270d6dd4f
Provide `use_path` to qr generator for svg data size reduction ( #32127 )
2024-10-02 13:26:46 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
db57fe80c8
Remove `page_json` var from ap/replies spec ( #32000 )
2024-09-26 08:54:01 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
c3b6a7a297
Reduce factory creation (36 -> 12) in `spec/controllers/oauth/*` area ( #32045 )
2024-09-25 07:56:08 +00:00
06ecf9008b
Remove single-use shared examples in controller specs ( #32044 )
2024-09-25 07:50:15 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
5dfdec6453
Convert `settings/applications` controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
e0b45b35c9
Combine repeated parsed_body assertions into single ( #32002 )
2024-09-23 08:42:52 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
5a8f2fe31d
Convert `settings/exports` controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
943738671c
Remove unneeded `to_s` on `Link` header comparison in statuses controller spec ( #31941 )
2024-09-18 08:21:31 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
207c073bf8
Remove debug output in migration controller spec ( #31886 )
2024-09-12 14:04:46 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Claire