Claire
b24f676cf1
Merge commit ' 1526e54ac6' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
Claire
3ad92e8d0d
Merge commit ' bd575a1dd6' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
Claire
a111fd7a0b
Merge commit ' b2c5b20ef2' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
Claire
d6ad9d351e
Merge commit ' a36b59be8a' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
b474cbbd28
Merge commit ' 7840c6b75b' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
46ddaffd40
Merge commit ' b87bfb8c96' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
bc33be0342
Merge commit ' 23e32a4b30' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Claire
4113fbf6e8
Merge commit ' f476d9dab2' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
1474318691
Merge commit ' a916251d8a' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Claire
9f92b05bd2
Merge commit ' 2e6bf60f15' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Matt Jankowski
c1f93def40
Reduce expectations for RSpec/MultipleExpectations cop in controllers/statuses spec ( #27875 )
2023-11-16 09:54:51 +00:00
Matt Jankowski
3de9145613
Move controller specs for well-known endpoints to request specs ( #27855 )
2023-11-15 19:12:02 +00:00
Matt Jankowski
fe58ac8d9f
Improve spec coverage for api/web/push_subscriptions controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 13:14:51 +00:00
Matt Jankowski
b2c5b20ef2
Fix RSpec/AnyInstance cop ( #27810 )
2023-11-14 14:52:59 +00:00
Matt Jankowski
49ba5a9f94
Use hash_including to check AccountFilter setup in admin/accounts controller spec ( #27838 )
2023-11-13 16:01:24 +00:00
Matt Jankowski
a36b59be8a
Spec coverage for api/v1/trends controllers ( #27837 )
2023-11-13 14:32:36 +00:00
Matt Jankowski
9dc3ce878b
Speed-up in Settings:: controllers specs ( #27808 )
2023-11-10 15:13:42 +00:00
Matt Jankowski
e79bf1b1e7
Minor speed improvement on controllers/accounts spec ( #27679 )
2023-11-09 16:21:11 +00:00
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
Matt Jankowski
69d00e2721
Fix RSpec/InstanceVariable cop ( #27766 )
2023-11-08 15:42:30 +00:00
Matt Jankowski
ce91d14d48
Fix Style/WordArray cop ( #27770 )
2023-11-08 13:03:44 +00:00
Matt Jankowski
e545978076
Use framework helpers instead of i-vars in controller specs ( #27767 )
2023-11-08 08:17:43 +00:00
Matt Jankowski
1d51e10510
Consolidate JSON parsing in serializers specs ( #27693 )
2023-11-07 15:20:24 +00:00
Matt Jankowski
dc0bf87090
Remove unused before block from settings/branding spec ( #27759 )
2023-11-07 15:19:17 +00:00
Matt Jankowski
49e2772064
Fix RSpec/MessageSpies cop ( #27751 )
2023-11-07 09:46:28 +00:00
Matt Jankowski
cfa14ec6d1
Fix Lint/EmptyBlock cop ( #27748 )
2023-11-07 09:11:04 +00:00
Matt Jankowski
b06284c572
Fix RSpec/HookArgument cop ( #27747 )
2023-11-07 09:10:36 +00:00
Matt Jankowski
d6f50839e1
Fix RSpec/SpecFilePathFormat cops ( #27730 )
2023-11-06 16:25:40 +00:00
Matt Jankowski
beee9ea991
Fix RSpec/LetSetup cop in spec/controllers/admin area ( #27619 )
2023-10-31 08:22:19 +00:00
Matt Jankowski
2e6bf60f15
Use deliveries.size in mailer-related examples in controller specs ( #27589 )
2023-10-27 15:33:52 +00:00
Claire
bbf46cc418
Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags for remote accounts ( #27459 )
2023-10-27 08:35:21 +00:00
Claire
e25cc4deb7
Merge commit ' 379115e601' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
Daniel M Brasil
26d2a2a0cc
Migrate to request specs in /api/v1/media ( #25543 )
2023-10-23 15:46:21 +00:00
Claire
74fd46d3ab
Merge commit ' 9f218c9924' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
Matt Jankowski
bcd0171e5e
Fix Lint/UselessAssignment cop ( #27472 )
2023-10-19 16:55:06 +02:00
Claire
c10a667ac2
Merge commit ' 935d54124e' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Claire
b867d4581e
Merge commit ' c91c0175db' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
Matt Jankowski
12bb7be8b5
Spec speed ups on AccountsController spec ( #25391 )
2023-10-17 13:32:10 +02:00
Matt Jankowski
893b2f33fd
Extract shared example for cacheable response in specs ( #25388 )
2023-10-16 17:52:06 +02:00
Matt Jankowski
708299bb0d
Misc coverage improvements for Admin:: and Settings:: controllers ( #25346 )
2023-10-16 17:20:28 +02:00
Daniel M Brasil
e0ed0f8c7c
Migrate to request specs in /api/v1/notifications ( #25553 )
2023-10-16 17:15:24 +02:00
Daniel M Brasil
cafdaec6cf
Migrate to request specs in /api/v1/lists/:id/accounts ( #25468 )
2023-10-16 16:03:48 +02:00
Daniel M Brasil
8e6116503d
Migrate to request specs in /api/v1/blocks ( #25517 )
2023-10-16 16:03:35 +02:00
Daniel M Brasil
d9caa6ed24
Migrate to request specs in /api/v1/admin/accounts ( #25563 )
2023-10-16 15:49:12 +02:00
Daniel M Brasil
82beeb2f7e
Migrate to request specs in /api/v1/admin/trends/links ( #25739 )
2023-10-13 16:23:16 +02:00
Claire
71cfdd7865
Fix duplicate tests ( #27395 )
2023-10-13 16:10:43 +02:00
Daniel M Brasil
bc6cd27d9e
Migrate to request specs in /api/v1/followed_tags ( #25472 )
2023-10-13 14:43:50 +02:00
Matt Jankowski
fd9dea21d0
DB speedup in API:: controller/request specs ( #25516 )
2023-10-13 14:42:09 +02:00
Daniel M Brasil
ecdb31d479
Migrate to request specs in /api/v1/favourites ( #25518 )
2023-10-13 14:19:12 +02:00
